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

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

Issue 821793002: Chromecast on Android buildfix: don't try to create a RendererFactory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « chromecast/renderer/cast_content_renderer_client.h ('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 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 webview->settings()->setMediaControlsOverlayPlayButtonEnabled(false); 65 webview->settings()->setMediaControlsOverlayPlayButtonEnabled(false);
66 } 66 }
67 } 67 }
68 68
69 void CastContentRendererClient::AddKeySystems( 69 void CastContentRendererClient::AddKeySystems(
70 std::vector< ::media::KeySystemInfo>* key_systems) { 70 std::vector< ::media::KeySystemInfo>* key_systems) {
71 AddChromecastKeySystems(key_systems); 71 AddChromecastKeySystems(key_systems);
72 AddChromecastPlatformKeySystems(key_systems); 72 AddChromecastPlatformKeySystems(key_systems);
73 } 73 }
74 74
75 #if !defined(OS_ANDROID)
75 scoped_ptr<::media::RendererFactory> 76 scoped_ptr<::media::RendererFactory>
76 CastContentRendererClient::CreateMediaRendererFactory( 77 CastContentRendererClient::CreateMediaRendererFactory(
77 ::content::RenderFrame* render_frame) { 78 ::content::RenderFrame* render_frame) {
78 const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); 79 const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
79 if (!cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline)) 80 if (!cmd_line->HasSwitch(switches::kEnableCmaMediaPipeline))
80 return nullptr; 81 return nullptr;
81 82
82 return scoped_ptr<::media::RendererFactory>( 83 return scoped_ptr<::media::RendererFactory>(
83 new chromecast::media::CmaMediaRendererFactory( 84 new chromecast::media::CmaMediaRendererFactory(
84 render_frame->GetRoutingID())); 85 render_frame->GetRoutingID()));
85 } 86 }
87 #endif
86 88
87 blink::WebPrescientNetworking* 89 blink::WebPrescientNetworking*
88 CastContentRendererClient::GetPrescientNetworking() { 90 CastContentRendererClient::GetPrescientNetworking() {
89 return prescient_networking_dispatcher_.get(); 91 return prescient_networking_dispatcher_.get();
90 } 92 }
91 93
92 } // namespace shell 94 } // namespace shell
93 } // namespace chromecast 95 } // namespace chromecast
OLDNEW
« no previous file with comments | « chromecast/renderer/cast_content_renderer_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698