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

Side by Side Diff: chromecast/renderer/cast_content_renderer_client.cc

Issue 947453004: Chromecast: fix build break in cast_content_renderer_client.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « no previous file | 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 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 "chromecast/renderer/cast_content_renderer_client.h" 5 #include "chromecast/renderer/cast_content_renderer_client.h"
6 6
7 #include <sys/sysinfo.h> 7 #include <sys/sysinfo.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/memory/memory_pressure_listener.h" 10 #include "base/memory/memory_pressure_listener.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 void CastContentRendererClient::AddKeySystems( 136 void CastContentRendererClient::AddKeySystems(
137 std::vector< ::media::KeySystemInfo>* key_systems) { 137 std::vector< ::media::KeySystemInfo>* key_systems) {
138 AddChromecastKeySystems(key_systems); 138 AddChromecastKeySystems(key_systems);
139 AddChromecastPlatformKeySystems(key_systems); 139 AddChromecastPlatformKeySystems(key_systems);
140 } 140 }
141 141
142 #if !defined(OS_ANDROID) 142 #if !defined(OS_ANDROID)
143 scoped_ptr<::media::RendererFactory> 143 scoped_ptr<::media::RendererFactory>
144 CastContentRendererClient::CreateMediaRendererFactory( 144 CastContentRendererClient::CreateMediaRendererFactory(
145 ::content::RenderFrame* render_frame, 145 ::content::RenderFrame* render_frame,
146 const scoped_refptr<media::MediaLog>& media_log) { 146 const scoped_refptr<::media::MediaLog>& media_log) {
147 const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); 147 const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
148 if (!cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline)) 148 if (!cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline))
149 return nullptr; 149 return nullptr;
150 150
151 return scoped_ptr<::media::RendererFactory>( 151 return scoped_ptr<::media::RendererFactory>(
152 new chromecast::media::CmaMediaRendererFactory( 152 new chromecast::media::CmaMediaRendererFactory(
153 render_frame->GetRoutingID())); 153 render_frame->GetRoutingID()));
154 } 154 }
155 #endif 155 #endif
156 156
157 blink::WebPrescientNetworking* 157 blink::WebPrescientNetworking*
158 CastContentRendererClient::GetPrescientNetworking() { 158 CastContentRendererClient::GetPrescientNetworking() {
159 return prescient_networking_dispatcher_.get(); 159 return prescient_networking_dispatcher_.get();
160 } 160 }
161 161
162 void CastContentRendererClient::DeferMediaLoad( 162 void CastContentRendererClient::DeferMediaLoad(
163 content::RenderFrame* render_frame, 163 content::RenderFrame* render_frame,
164 const base::Closure& closure) { 164 const base::Closure& closure) {
165 if (!render_frame->IsHidden()) { 165 if (!render_frame->IsHidden()) {
166 closure.Run(); 166 closure.Run();
167 return; 167 return;
168 } 168 }
169 169
170 // Lifetime is tied to |render_frame| via content::RenderFrameObserver. 170 // Lifetime is tied to |render_frame| via content::RenderFrameObserver.
171 new CastMediaLoadDeferrer(render_frame, closure); 171 new CastMediaLoadDeferrer(render_frame, closure);
172 } 172 }
173 173
174 } // namespace shell 174 } // namespace shell
175 } // namespace chromecast 175 } // namespace chromecast
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698