Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1845)

Side by Side Diff: content/browser/media/android/browser_media_player_manager.h

Issue 297703002: Using GURL in place of std::string for destination_url (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/media/android/browser_media_player_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
6 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ 6 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 virtual media::MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE; 93 virtual media::MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE;
94 virtual media::MediaKeys* GetCdm(int cdm_id) OVERRIDE; 94 virtual media::MediaKeys* GetCdm(int cdm_id) OVERRIDE;
95 virtual void DestroyAllMediaPlayers() OVERRIDE; 95 virtual void DestroyAllMediaPlayers() OVERRIDE;
96 virtual void RequestFullScreen(int player_id) OVERRIDE; 96 virtual void RequestFullScreen(int player_id) OVERRIDE;
97 virtual void OnSessionCreated(int cdm_id, 97 virtual void OnSessionCreated(int cdm_id,
98 uint32 session_id, 98 uint32 session_id,
99 const std::string& web_session_id) OVERRIDE; 99 const std::string& web_session_id) OVERRIDE;
100 virtual void OnSessionMessage(int cdm_id, 100 virtual void OnSessionMessage(int cdm_id,
101 uint32 session_id, 101 uint32 session_id,
102 const std::vector<uint8>& message, 102 const std::vector<uint8>& message,
103 const std::string& destination_url) OVERRIDE; 103 const GURL& destination_url) OVERRIDE;
104 virtual void OnSessionReady(int cdm_id, uint32 session_id) OVERRIDE; 104 virtual void OnSessionReady(int cdm_id, uint32 session_id) OVERRIDE;
105 virtual void OnSessionClosed(int cdm_id, uint32 session_id) OVERRIDE; 105 virtual void OnSessionClosed(int cdm_id, uint32 session_id) OVERRIDE;
106 virtual void OnSessionError(int cdm_id, 106 virtual void OnSessionError(int cdm_id,
107 uint32 session_id, 107 uint32 session_id,
108 media::MediaKeys::KeyError error_code, 108 media::MediaKeys::KeyError error_code,
109 uint32 system_code) OVERRIDE; 109 uint32 system_code) OVERRIDE;
110 110
111 #if defined(VIDEO_HOLE) 111 #if defined(VIDEO_HOLE)
112 void AttachExternalVideoSurface(int player_id, jobject surface); 112 void AttachExternalVideoSurface(int player_id, jobject surface);
113 void DetachExternalVideoSurface(int player_id); 113 void DetachExternalVideoSurface(int player_id);
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 263
264 // NOTE: Weak pointers must be invalidated before all other member variables. 264 // NOTE: Weak pointers must be invalidated before all other member variables.
265 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_; 265 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_;
266 266
267 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager); 267 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager);
268 }; 268 };
269 269
270 } // namespace content 270 } // namespace content
271 271
272 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ 272 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/media/android/browser_media_player_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698