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

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

Issue 1875623002: Convert //chromecast from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
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 <stdint.h> 7 #include <stdint.h>
8 #include <sys/sysinfo.h> 8 #include <sys/sysinfo.h>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 webview->settings()->setOfflineWebApplicationCacheEnabled(false); 139 webview->settings()->setOfflineWebApplicationCacheEnabled(false);
140 } 140 }
141 } 141 }
142 142
143 void CastContentRendererClient::AddKeySystems( 143 void CastContentRendererClient::AddKeySystems(
144 std::vector< ::media::KeySystemInfo>* key_systems) { 144 std::vector< ::media::KeySystemInfo>* key_systems) {
145 AddChromecastKeySystems(key_systems); 145 AddChromecastKeySystems(key_systems);
146 } 146 }
147 147
148 #if !defined(OS_ANDROID) 148 #if !defined(OS_ANDROID)
149 scoped_ptr<::media::RendererFactory> 149 std::unique_ptr<::media::RendererFactory>
150 CastContentRendererClient::CreateMediaRendererFactory( 150 CastContentRendererClient::CreateMediaRendererFactory(
151 ::content::RenderFrame* render_frame, 151 ::content::RenderFrame* render_frame,
152 ::media::GpuVideoAcceleratorFactories* gpu_factories, 152 ::media::GpuVideoAcceleratorFactories* gpu_factories,
153 const scoped_refptr<::media::MediaLog>& media_log) { 153 const scoped_refptr<::media::MediaLog>& media_log) {
154 const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); 154 const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
155 if (!cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline)) 155 if (!cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline))
156 return nullptr; 156 return nullptr;
157 157
158 return scoped_ptr<::media::RendererFactory>( 158 return std::unique_ptr<::media::RendererFactory>(
159 new chromecast::media::ChromecastMediaRendererFactory( 159 new chromecast::media::ChromecastMediaRendererFactory(
160 gpu_factories, render_frame->GetRoutingID())); 160 gpu_factories, render_frame->GetRoutingID()));
161 } 161 }
162 #endif 162 #endif
163 163
164 blink::WebPrescientNetworking* 164 blink::WebPrescientNetworking*
165 CastContentRendererClient::GetPrescientNetworking() { 165 CastContentRendererClient::GetPrescientNetworking() {
166 return prescient_networking_dispatcher_.get(); 166 return prescient_networking_dispatcher_.get();
167 } 167 }
168 168
169 void CastContentRendererClient::DeferMediaLoad( 169 void CastContentRendererClient::DeferMediaLoad(
170 content::RenderFrame* render_frame, 170 content::RenderFrame* render_frame,
171 bool render_frame_has_played_media_before, 171 bool render_frame_has_played_media_before,
172 const base::Closure& closure) { 172 const base::Closure& closure) {
173 if (!render_frame->IsHidden() || allow_hidden_media_playback_) { 173 if (!render_frame->IsHidden() || allow_hidden_media_playback_) {
174 closure.Run(); 174 closure.Run();
175 return; 175 return;
176 } 176 }
177 177
178 // Lifetime is tied to |render_frame| via content::RenderFrameObserver. 178 // Lifetime is tied to |render_frame| via content::RenderFrameObserver.
179 new CastMediaLoadDeferrer(render_frame, closure); 179 new CastMediaLoadDeferrer(render_frame, closure);
180 } 180 }
181 181
182 } // namespace shell 182 } // namespace shell
183 } // namespace chromecast 183 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/renderer/cast_content_renderer_client.h ('k') | chromecast/renderer/cast_content_renderer_client_simple.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698