| Index: content/browser/media/android/browser_media_player_manager.h
|
| diff --git a/content/browser/media/android/browser_media_player_manager.h b/content/browser/media/android/browser_media_player_manager.h
|
| index 7796805ecfaf85aa904b4497e49b0843786049c8..06f27e54d06cbc619cd33017bcf03e469ea8c07a 100644
|
| --- a/content/browser/media/android/browser_media_player_manager.h
|
| +++ b/content/browser/media/android/browser_media_player_manager.h
|
| @@ -143,7 +143,7 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
|
| const GURL& frame_url);
|
| void OnCreateSession(int media_keys_id,
|
| uint32 session_id,
|
| - MediaKeysHostMsg_CreateSession_Type type,
|
| + MediaKeysHostMsg_CreateSession_Type content_type,
|
| const std::vector<uint8>& init_data);
|
| void OnUpdateSession(int media_keys_id,
|
| uint32 session_id,
|
| @@ -188,7 +188,7 @@ class CONTENT_EXPORT BrowserMediaPlayerManager
|
| // bar or from the saved preference.
|
| void CreateSessionIfPermitted(int media_keys_id,
|
| uint32 session_id,
|
| - const std::string& type,
|
| + const std::string& content_type,
|
| const std::vector<uint8>& init_data,
|
| bool permitted);
|
|
|
|
|