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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 644463003: [Cast, Android] Don't hold the wake lock if the video is playing remotely. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Ignore remote players altogether Created 6 years, 2 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
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 3177 matching lines...) Expand 10 before | Expand all | Expand 10 after
3188 void RenderFrameImpl::didChangeManifest(blink::WebLocalFrame* frame) 3188 void RenderFrameImpl::didChangeManifest(blink::WebLocalFrame* frame)
3189 { 3189 {
3190 DCHECK(!frame_ || frame_ == frame); 3190 DCHECK(!frame_ || frame_ == frame);
3191 3191
3192 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidChangeManifest()); 3192 FOR_EACH_OBSERVER(RenderFrameObserver, observers_, DidChangeManifest());
3193 } 3193 }
3194 3194
3195 void RenderFrameImpl::DidPlay(blink::WebMediaPlayer* player) { 3195 void RenderFrameImpl::DidPlay(blink::WebMediaPlayer* player) {
3196 Send(new FrameHostMsg_MediaPlayingNotification( 3196 Send(new FrameHostMsg_MediaPlayingNotification(
3197 routing_id_, reinterpret_cast<int64>(player), player->hasVideo(), 3197 routing_id_, reinterpret_cast<int64>(player), player->hasVideo(),
3198 player->hasAudio())); 3198 player->hasAudio(), player->isRemote()));
3199 } 3199 }
3200 3200
3201 void RenderFrameImpl::DidPause(blink::WebMediaPlayer* player) { 3201 void RenderFrameImpl::DidPause(blink::WebMediaPlayer* player) {
3202 Send(new FrameHostMsg_MediaPausedNotification( 3202 Send(new FrameHostMsg_MediaPausedNotification(
3203 routing_id_, reinterpret_cast<int64>(player))); 3203 routing_id_, reinterpret_cast<int64>(player)));
3204 } 3204 }
3205 3205
3206 void RenderFrameImpl::PlayerGone(blink::WebMediaPlayer* player) { 3206 void RenderFrameImpl::PlayerGone(blink::WebMediaPlayer* player) {
3207 DidPause(player); 3207 DidPause(player);
3208 } 3208 }
(...skipping 769 matching lines...) Expand 10 before | Expand all | Expand 10 after
3978 3978
3979 #if defined(ENABLE_BROWSER_CDMS) 3979 #if defined(ENABLE_BROWSER_CDMS)
3980 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3980 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3981 if (!cdm_manager_) 3981 if (!cdm_manager_)
3982 cdm_manager_ = new RendererCdmManager(this); 3982 cdm_manager_ = new RendererCdmManager(this);
3983 return cdm_manager_; 3983 return cdm_manager_;
3984 } 3984 }
3985 #endif // defined(ENABLE_BROWSER_CDMS) 3985 #endif // defined(ENABLE_BROWSER_CDMS)
3986 3986
3987 } // namespace content 3987 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698