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

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: addressing comments, adding checks Created 6 years, 7 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
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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 virtual media::MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE; 92 virtual media::MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE;
93 virtual media::MediaKeys* GetCdm(int cdm_id) OVERRIDE; 93 virtual media::MediaKeys* GetCdm(int cdm_id) OVERRIDE;
94 virtual void DestroyAllMediaPlayers() OVERRIDE; 94 virtual void DestroyAllMediaPlayers() OVERRIDE;
95 virtual void RequestFullScreen(int player_id) OVERRIDE; 95 virtual void RequestFullScreen(int player_id) OVERRIDE;
96 virtual void OnSessionCreated(int cdm_id, 96 virtual void OnSessionCreated(int cdm_id,
97 uint32 session_id, 97 uint32 session_id,
98 const std::string& web_session_id) OVERRIDE; 98 const std::string& web_session_id) OVERRIDE;
99 virtual void OnSessionMessage(int cdm_id, 99 virtual void OnSessionMessage(int cdm_id,
100 uint32 session_id, 100 uint32 session_id,
101 const std::vector<uint8>& message, 101 const std::vector<uint8>& message,
102 const std::string& destination_url) OVERRIDE; 102 const GURL& destination_url) OVERRIDE;
103 virtual void OnSessionReady(int cdm_id, uint32 session_id) OVERRIDE; 103 virtual void OnSessionReady(int cdm_id, uint32 session_id) OVERRIDE;
104 virtual void OnSessionClosed(int cdm_id, uint32 session_id) OVERRIDE; 104 virtual void OnSessionClosed(int cdm_id, uint32 session_id) OVERRIDE;
105 virtual void OnSessionError(int cdm_id, 105 virtual void OnSessionError(int cdm_id,
106 uint32 session_id, 106 uint32 session_id,
107 media::MediaKeys::KeyError error_code, 107 media::MediaKeys::KeyError error_code,
108 uint32 system_code) OVERRIDE; 108 uint32 system_code) OVERRIDE;
109 109
110 #if defined(VIDEO_HOLE) 110 #if defined(VIDEO_HOLE)
111 void AttachExternalVideoSurface(int player_id, jobject surface); 111 void AttachExternalVideoSurface(int player_id, jobject surface);
112 void DetachExternalVideoSurface(int player_id); 112 void DetachExternalVideoSurface(int player_id);
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 251
252 // NOTE: Weak pointers must be invalidated before all other member variables. 252 // NOTE: Weak pointers must be invalidated before all other member variables.
253 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_; 253 base::WeakPtrFactory<BrowserMediaPlayerManager> weak_ptr_factory_;
254 254
255 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager); 255 DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManager);
256 }; 256 };
257 257
258 } // namespace content 258 } // namespace content
259 259
260 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_ 260 #endif // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_MEDIA_PLAYER_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698