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

Side by Side Diff: content/renderer/media/android/renderer_media_player_manager.cc

Issue 107413006: Dismiss EME infobar when WebMediaPlayer is destroyed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: make FakeProfile class happy Created 6 years, 11 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 #include "content/renderer/media/android/renderer_media_player_manager.h" 5 #include "content/renderer/media/android/renderer_media_player_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "content/common/media/media_player_messages_android.h" 9 #include "content/common/media/media_player_messages_android.h"
10 #include "content/renderer/media/android/proxy_media_keys.h" 10 #include "content/renderer/media/android/proxy_media_keys.h"
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 Send(new MediaKeysHostMsg_UpdateSession( 256 Send(new MediaKeysHostMsg_UpdateSession(
257 routing_id(), media_keys_id, session_id, response)); 257 routing_id(), media_keys_id, session_id, response));
258 } 258 }
259 259
260 void RendererMediaPlayerManager::ReleaseSession(int media_keys_id, 260 void RendererMediaPlayerManager::ReleaseSession(int media_keys_id,
261 uint32 session_id) { 261 uint32 session_id) {
262 Send(new MediaKeysHostMsg_ReleaseSession( 262 Send(new MediaKeysHostMsg_ReleaseSession(
263 routing_id(), media_keys_id, session_id)); 263 routing_id(), media_keys_id, session_id));
264 } 264 }
265 265
266 void RendererMediaPlayerManager::CancelAllPendingSessionCreations(
267 int media_keys_id) {
268 Send(new MediaKeysHostMsg_CancelAllPendingSessionCreations(
269 routing_id(), media_keys_id));
270 }
271
266 void RendererMediaPlayerManager::OnSessionCreated( 272 void RendererMediaPlayerManager::OnSessionCreated(
267 int media_keys_id, 273 int media_keys_id,
268 uint32 session_id, 274 uint32 session_id,
269 const std::string& web_session_id) { 275 const std::string& web_session_id) {
270 if (web_session_id.length() > kEmeWebSessionIdMaximum) { 276 if (web_session_id.length() > kEmeWebSessionIdMaximum) {
271 OnSessionError( 277 OnSessionError(
272 media_keys_id, session_id, media::MediaKeys::kUnknownError, 0); 278 media_keys_id, session_id, media::MediaKeys::kUnknownError, 0);
273 return; 279 return;
274 } 280 }
275 281
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 gfx::RectF rect; 428 gfx::RectF rect;
423 if (player->RetrieveGeometryChange(&rect)) { 429 if (player->RetrieveGeometryChange(&rect)) {
424 (*changes)[player_it->first] = rect; 430 (*changes)[player_it->first] = rect;
425 } 431 }
426 } 432 }
427 } 433 }
428 } 434 }
429 #endif // defined(VIDEO_HOLE) 435 #endif // defined(VIDEO_HOLE)
430 436
431 } // namespace content 437 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/android/renderer_media_player_manager.h ('k') | content/shell/browser/shell_browser_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698