diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-03-18 10:20:56 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-03-18 10:20:56 +0000 |
| commit | a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 (patch) | |
| tree | 3437151d9ae1ce20a1e53a0d98c19ca01c786394 /media/base/media_keys.h | |
| parent | af5066f1e36c6579e74752647e6c584438f80f94 (diff) | |
| download | chromium_org-a1401311d1ab56c4ed0a474bd38c108f75cb0cd9.tar.gz | |
Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
Diffstat (limited to 'media/base/media_keys.h')
| -rw-r--r-- | media/base/media_keys.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/base/media_keys.h b/media/base/media_keys.h index 84c1401482..a6ef64ceee 100644 --- a/media/base/media_keys.h +++ b/media/base/media_keys.h @@ -93,7 +93,7 @@ typedef base::Callback<void(uint32 session_id)> SessionClosedCB; typedef base::Callback<void(uint32 session_id, media::MediaKeys::KeyError error_code, - int system_code)> SessionErrorCB; + uint32 system_code)> SessionErrorCB; } // namespace media |