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

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: Created 7 years 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 IPC_MESSAGE_HANDLER(MediaPlayerMsg_RequestFullscreen, 61 IPC_MESSAGE_HANDLER(MediaPlayerMsg_RequestFullscreen,
62 OnRequestFullscreen) 62 OnRequestFullscreen)
63 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidEnterFullscreen, OnDidEnterFullscreen) 63 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidEnterFullscreen, OnDidEnterFullscreen)
64 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen) 64 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen)
65 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay) 65 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay)
66 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause) 66 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause)
67 IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionCreated, OnSessionCreated) 67 IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionCreated, OnSessionCreated)
68 IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionMessage, OnSessionMessage) 68 IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionMessage, OnSessionMessage)
69 IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionReady, OnSessionReady) 69 IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionReady, OnSessionReady)
70 IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionClosed, OnSessionClosed) 70 IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionClosed, OnSessionClosed)
71 IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionApproved, OnSessionApproved)
71 IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionError, OnSessionError) 72 IPC_MESSAGE_HANDLER(MediaKeysMsg_SessionError, OnSessionError)
72 IPC_MESSAGE_UNHANDLED(handled = false) 73 IPC_MESSAGE_UNHANDLED(handled = false)
73 IPC_END_MESSAGE_MAP() 74 IPC_END_MESSAGE_MAP()
74 return handled; 75 return handled;
75 } 76 }
76 77
77 void RendererMediaPlayerManager::Initialize( 78 void RendererMediaPlayerManager::Initialize(
78 MediaPlayerHostMsg_Initialize_Type type, 79 MediaPlayerHostMsg_Initialize_Type type,
79 int player_id, 80 int player_id,
80 const GURL& url, 81 const GURL& url,
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 Send(new MediaKeysHostMsg_UpdateSession( 257 Send(new MediaKeysHostMsg_UpdateSession(
257 routing_id(), media_keys_id, session_id, response)); 258 routing_id(), media_keys_id, session_id, response));
258 } 259 }
259 260
260 void RendererMediaPlayerManager::ReleaseSession(int media_keys_id, 261 void RendererMediaPlayerManager::ReleaseSession(int media_keys_id,
261 uint32 session_id) { 262 uint32 session_id) {
262 Send(new MediaKeysHostMsg_ReleaseSession( 263 Send(new MediaKeysHostMsg_ReleaseSession(
263 routing_id(), media_keys_id, session_id)); 264 routing_id(), media_keys_id, session_id));
264 } 265 }
265 266
267 void RendererMediaPlayerManager::CancelSession(int media_keys_id,
268 uint32 session_id) {
269 Send(new MediaKeysHostMsg_CancelSession(
270 routing_id(), media_keys_id, session_id));
271 }
272
266 void RendererMediaPlayerManager::OnSessionCreated( 273 void RendererMediaPlayerManager::OnSessionCreated(
267 int media_keys_id, 274 int media_keys_id,
268 uint32 session_id, 275 uint32 session_id,
269 const std::string& web_session_id) { 276 const std::string& web_session_id) {
270 if (web_session_id.length() > kEmeWebSessionIdMaximum) { 277 if (web_session_id.length() > kEmeWebSessionIdMaximum) {
271 OnSessionError( 278 OnSessionError(
272 media_keys_id, session_id, media::MediaKeys::kUnknownError, 0); 279 media_keys_id, session_id, media::MediaKeys::kUnknownError, 0);
273 return; 280 return;
274 } 281 }
275 282
(...skipping 30 matching lines...) Expand all
306 media_keys->OnSessionReady(session_id); 313 media_keys->OnSessionReady(session_id);
307 } 314 }
308 315
309 void RendererMediaPlayerManager::OnSessionClosed(int media_keys_id, 316 void RendererMediaPlayerManager::OnSessionClosed(int media_keys_id,
310 uint32 session_id) { 317 uint32 session_id) {
311 ProxyMediaKeys* media_keys = GetMediaKeys(media_keys_id); 318 ProxyMediaKeys* media_keys = GetMediaKeys(media_keys_id);
312 if (media_keys) 319 if (media_keys)
313 media_keys->OnSessionClosed(session_id); 320 media_keys->OnSessionClosed(session_id);
314 } 321 }
315 322
323 void RendererMediaPlayerManager::OnSessionApproved(int media_keys_id,
324 uint32 session_id,
325 bool success) {
326 ProxyMediaKeys* media_keys = GetMediaKeys(media_keys_id);
327 if (media_keys)
328 media_keys->OnSessionApproved(session_id, success);
329 }
330
316 void RendererMediaPlayerManager::OnSessionError( 331 void RendererMediaPlayerManager::OnSessionError(
317 int media_keys_id, 332 int media_keys_id,
318 uint32 session_id, 333 uint32 session_id,
319 media::MediaKeys::KeyError error_code, 334 media::MediaKeys::KeyError error_code,
320 int system_code) { 335 int system_code) {
321 ProxyMediaKeys* media_keys = GetMediaKeys(media_keys_id); 336 ProxyMediaKeys* media_keys = GetMediaKeys(media_keys_id);
322 if (media_keys) 337 if (media_keys)
323 media_keys->OnSessionError(session_id, error_code, system_code); 338 media_keys->OnSessionError(session_id, error_code, system_code);
324 } 339 }
325 340
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
422 gfx::RectF rect; 437 gfx::RectF rect;
423 if (player->RetrieveGeometryChange(&rect)) { 438 if (player->RetrieveGeometryChange(&rect)) {
424 (*changes)[player_it->first] = rect; 439 (*changes)[player_it->first] = rect;
425 } 440 }
426 } 441 }
427 } 442 }
428 } 443 }
429 #endif // defined(VIDEO_HOLE) 444 #endif // defined(VIDEO_HOLE)
430 445
431 } // namespace content 446 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698