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

Side by Side Diff: content/browser/media/media_web_contents_observer.cc

Issue 1515623002: Media Session: passing metadata from renderer/ to browser/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@media_session_ipc
Patch Set: cleanup Created 5 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/browser/media/media_web_contents_observer.h" 5 #include "content/browser/media/media_web_contents_observer.h"
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "content/browser/media/cdm/browser_cdm_manager.h" 9 #include "content/browser/media/cdm/browser_cdm_manager.h"
10 #include "content/browser/renderer_host/render_process_host_impl.h" 10 #include "content/browser/renderer_host/render_process_host_impl.h"
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 BrowserMediaPlayerManager::OnRequestRemotePlayback) 291 BrowserMediaPlayerManager::OnRequestRemotePlayback)
292 IPC_MESSAGE_FORWARD( 292 IPC_MESSAGE_FORWARD(
293 MediaPlayerHostMsg_RequestRemotePlaybackControl, 293 MediaPlayerHostMsg_RequestRemotePlaybackControl,
294 GetMediaPlayerManager(render_frame_host), 294 GetMediaPlayerManager(render_frame_host),
295 BrowserMediaPlayerManager::OnRequestRemotePlaybackControl) 295 BrowserMediaPlayerManager::OnRequestRemotePlaybackControl)
296 #if defined(VIDEO_HOLE) 296 #if defined(VIDEO_HOLE)
297 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_NotifyExternalSurface, 297 IPC_MESSAGE_FORWARD(MediaPlayerHostMsg_NotifyExternalSurface,
298 GetMediaPlayerManager(render_frame_host), 298 GetMediaPlayerManager(render_frame_host),
299 BrowserMediaPlayerManager::OnNotifyExternalSurface) 299 BrowserMediaPlayerManager::OnNotifyExternalSurface)
300 #endif // defined(VIDEO_HOLE) 300 #endif // defined(VIDEO_HOLE)
301 IPC_MESSAGE_FORWARD(MediaSessionHostMsg_Activate, 301 IPC_MESSAGE_FORWARD(MediaSessionHostMsg_Activate,
DaleCurtis 2015/12/11 17:16:00 nit: Can you move these three messages into a new
mlamouri (slow - plz ping) 2016/01/05 16:01:16 Done.
302 GetMediaSessionManager(render_frame_host), 302 GetMediaSessionManager(render_frame_host),
303 BrowserMediaSessionManager::OnActivate) 303 BrowserMediaSessionManager::OnActivate)
304 IPC_MESSAGE_FORWARD(MediaSessionHostMsg_Deactivate, 304 IPC_MESSAGE_FORWARD(MediaSessionHostMsg_Deactivate,
305 GetMediaSessionManager(render_frame_host), 305 GetMediaSessionManager(render_frame_host),
306 BrowserMediaSessionManager::OnDeactivate) 306 BrowserMediaSessionManager::OnDeactivate)
307 IPC_MESSAGE_FORWARD(MediaSessionHostMsg_SetMetadata,
308 GetMediaSessionManager(render_frame_host),
309 BrowserMediaSessionManager::OnSetMetadata)
307 IPC_MESSAGE_UNHANDLED(handled = false) 310 IPC_MESSAGE_UNHANDLED(handled = false)
308 IPC_END_MESSAGE_MAP() 311 IPC_END_MESSAGE_MAP()
309 return handled; 312 return handled;
310 } 313 }
311 314
312 bool MediaWebContentsObserver::OnMediaPlayerSetCdmMessageReceived( 315 bool MediaWebContentsObserver::OnMediaPlayerSetCdmMessageReceived(
313 const IPC::Message& msg, 316 const IPC::Message& msg,
314 RenderFrameHost* render_frame_host) { 317 RenderFrameHost* render_frame_host) {
315 bool handled = true; 318 bool handled = true;
316 IPC_BEGIN_MESSAGE_MAP_WITH_PARAM( 319 IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 for (auto it = media_player_managers_.begin(); 383 for (auto it = media_player_managers_.begin();
381 it != media_player_managers_.end(); ++it) { 384 it != media_player_managers_.end(); ++it) {
382 it->second->OnFrameInfoUpdated(); 385 it->second->OnFrameInfoUpdated();
383 } 386 }
384 } 387 }
385 #endif // defined(VIDEO_HOLE) 388 #endif // defined(VIDEO_HOLE)
386 389
387 #endif // defined(OS_ANDROID) 390 #endif // defined(OS_ANDROID)
388 391
389 } // namespace content 392 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698