Chromium Code Reviews

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

Issue 1308983005: NOT FOR LANDING Implement WebMediaSession (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add forward declaration Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
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/command_line.h" 7 #include "base/command_line.h"
8 #include "content/common/media/media_player_messages_android.h" 8 #include "content/common/media/media_player_messages_android.h"
9 #include "content/public/common/renderer_preferences.h" 9 #include "content/public/common/renderer_preferences.h"
10 #include "content/renderer/media/android/webmediaplayer_android.h" 10 #include "content/renderer/media/android/webmediaplayer_android.h"
(...skipping 66 matching lines...)
77 } 77 }
78 } 78 }
79 79
80 void RendererMediaPlayerManager::Initialize( 80 void RendererMediaPlayerManager::Initialize(
81 MediaPlayerHostMsg_Initialize_Type type, 81 MediaPlayerHostMsg_Initialize_Type type,
82 int player_id, 82 int player_id,
83 const GURL& url, 83 const GURL& url,
84 const GURL& first_party_for_cookies, 84 const GURL& first_party_for_cookies,
85 int demuxer_client_id, 85 int demuxer_client_id,
86 const GURL& frame_url, 86 const GURL& frame_url,
87 bool allow_credentials) { 87 bool allow_credentials,
88 int session_id) {
88 MediaPlayerHostMsg_Initialize_Params media_player_params; 89 MediaPlayerHostMsg_Initialize_Params media_player_params;
89 media_player_params.type = type; 90 media_player_params.type = type;
90 media_player_params.player_id = player_id; 91 media_player_params.player_id = player_id;
91 media_player_params.demuxer_client_id = demuxer_client_id; 92 media_player_params.demuxer_client_id = demuxer_client_id;
92 media_player_params.url = url; 93 media_player_params.url = url;
93 media_player_params.first_party_for_cookies = first_party_for_cookies; 94 media_player_params.first_party_for_cookies = first_party_for_cookies;
94 media_player_params.frame_url = frame_url; 95 media_player_params.frame_url = frame_url;
95 media_player_params.allow_credentials = allow_credentials; 96 media_player_params.allow_credentials = allow_credentials;
97 media_player_params.session_id = session_id;
96 98
97 Send(new MediaPlayerHostMsg_Initialize(routing_id(), media_player_params)); 99 Send(new MediaPlayerHostMsg_Initialize(routing_id(), media_player_params));
98 } 100 }
99 101
100 void RendererMediaPlayerManager::Start(int player_id) { 102 void RendererMediaPlayerManager::Start(int player_id) {
101 Send(new MediaPlayerHostMsg_Start(routing_id(), player_id)); 103 Send(new MediaPlayerHostMsg_Start(routing_id(), player_id));
102 } 104 }
103 105
104 void RendererMediaPlayerManager::Pause( 106 void RendererMediaPlayerManager::Pause(
105 int player_id, 107 int player_id,
(...skipping 215 matching lines...)
321 323
322 bool 324 bool
323 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() { 325 RendererMediaPlayerManager::ShouldUseVideoOverlayForEmbeddedEncryptedVideo() {
324 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>( 326 const RendererPreferences& prefs = static_cast<RenderFrameImpl*>(
325 render_frame())->render_view()->renderer_preferences(); 327 render_frame())->render_view()->renderer_preferences();
326 return prefs.use_video_overlay_for_embedded_encrypted_video; 328 return prefs.use_video_overlay_for_embedded_encrypted_video;
327 } 329 }
328 #endif // defined(VIDEO_HOLE) 330 #endif // defined(VIDEO_HOLE)
329 331
330 } // namespace content 332 } // namespace content
OLDNEW

Powered by Google App Engine