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

Side by Side Diff: content/browser/android/media_player_manager_impl.h

Issue 17563002: Add the SetMediaKeys handler to pass a drm bridge to a MediaSourcePlayer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_ANDROID_MEDIA_PLAYER_MANAGER_IMPL_H_ 5 #ifndef CONTENT_BROWSER_ANDROID_MEDIA_PLAYER_MANAGER_IMPL_H_
6 #define CONTENT_BROWSER_ANDROID_MEDIA_PLAYER_MANAGER_IMPL_H_ 6 #define CONTENT_BROWSER_ANDROID_MEDIA_PLAYER_MANAGER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 void OnInitializeCDM(int media_keys_id, const std::vector<uint8>& uuid); 126 void OnInitializeCDM(int media_keys_id, const std::vector<uint8>& uuid);
127 void OnGenerateKeyRequest(int media_keys_id, 127 void OnGenerateKeyRequest(int media_keys_id,
128 const std::string& type, 128 const std::string& type,
129 const std::vector<uint8>& init_data); 129 const std::vector<uint8>& init_data);
130 void OnAddKey(int media_keys_id, 130 void OnAddKey(int media_keys_id,
131 const std::vector<uint8>& key, 131 const std::vector<uint8>& key,
132 const std::vector<uint8>& init_data, 132 const std::vector<uint8>& init_data,
133 const std::string& session_id); 133 const std::string& session_id);
134 void OnCancelKeyRequest(int media_keys_id, const std::string& session_id); 134 void OnCancelKeyRequest(int media_keys_id, const std::string& session_id);
135 void OnDurationChanged(int player_id, const base::TimeDelta& duration); 135 void OnDurationChanged(int player_id, const base::TimeDelta& duration);
136 void OnSetMediaKeys(int player_id, int media_keys_id);
136 137
137 #if defined(GOOGLE_TV) 138 #if defined(GOOGLE_TV)
138 virtual void OnNotifyExternalSurface( 139 virtual void OnNotifyExternalSurface(
139 int player_id, bool is_request, const gfx::RectF& rect); 140 int player_id, bool is_request, const gfx::RectF& rect);
140 #endif 141 #endif
141 142
142 // Adds a given player to the list. 143 // Adds a given player to the list.
143 void AddPlayer(media::MediaPlayerAndroid* player); 144 void AddPlayer(media::MediaPlayerAndroid* player);
144 145
145 // Removes the player with the specified id. 146 // Removes the player with the specified id.
(...skipping 23 matching lines...) Expand all
169 170
170 // Object for retrieving resources media players. 171 // Object for retrieving resources media players.
171 scoped_ptr<media::MediaResourceGetter> media_resource_getter_; 172 scoped_ptr<media::MediaResourceGetter> media_resource_getter_;
172 173
173 DISALLOW_COPY_AND_ASSIGN(MediaPlayerManagerImpl); 174 DISALLOW_COPY_AND_ASSIGN(MediaPlayerManagerImpl);
174 }; 175 };
175 176
176 } // namespace content 177 } // namespace content
177 178
178 #endif // CONTENT_BROWSER_ANDROID_MEDIA_PLAYER_MANAGER_IMPL_H_ 179 #endif // CONTENT_BROWSER_ANDROID_MEDIA_PLAYER_MANAGER_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/android/media_player_manager_impl.cc » ('j') | media/base/android/media_source_player.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698