| OLD | NEW |
| 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/browser/cast_content_browser_client.h" | 5 #include "chromecast/browser/cast_content_browser_client.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/files/scoped_file.h" | 8 #include "base/files/scoped_file.h" |
| 9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 } | 91 } |
| 92 return false; | 92 return false; |
| 93 } | 93 } |
| 94 | 94 |
| 95 void CastContentBrowserClient::AppendExtraCommandLineSwitches( | 95 void CastContentBrowserClient::AppendExtraCommandLineSwitches( |
| 96 base::CommandLine* command_line, | 96 base::CommandLine* command_line, |
| 97 int child_process_id) { | 97 int child_process_id) { |
| 98 | 98 |
| 99 std::string process_type = | 99 std::string process_type = |
| 100 command_line->GetSwitchValueNative(switches::kProcessType); | 100 command_line->GetSwitchValueNative(switches::kProcessType); |
| 101 // Renderer process comamndline | 101 |
| 102 // Renderer process command-line |
| 102 if (process_type == switches::kRendererProcess) { | 103 if (process_type == switches::kRendererProcess) { |
| 103 // Any browser command-line switches that should be propagated to | 104 // Any browser command-line switches that should be propagated to |
| 104 // the renderer go here. | 105 // the renderer go here. |
| 106 #if defined(OS_ANDROID) |
| 107 command_line->AppendSwitch(switches::kForceUseOverlayEmbeddedVideo); |
| 108 #endif // defined(OS_ANDROID) |
| 105 } | 109 } |
| 106 } | 110 } |
| 107 | 111 |
| 108 content::AccessTokenStore* CastContentBrowserClient::CreateAccessTokenStore() { | 112 content::AccessTokenStore* CastContentBrowserClient::CreateAccessTokenStore() { |
| 109 return new CastAccessTokenStore( | 113 return new CastAccessTokenStore( |
| 110 CastBrowserProcess::GetInstance()->browser_context()); | 114 CastBrowserProcess::GetInstance()->browser_context()); |
| 111 } | 115 } |
| 112 | 116 |
| 113 void CastContentBrowserClient::OverrideWebkitPrefs( | 117 void CastContentBrowserClient::OverrideWebkitPrefs( |
| 114 content::RenderViewHost* render_view_host, | 118 content::RenderViewHost* render_view_host, |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 content::ExternalVideoSurfaceContainer* | 256 content::ExternalVideoSurfaceContainer* |
| 253 CastContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( | 257 CastContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( |
| 254 content::WebContents* web_contents) { | 258 content::WebContents* web_contents) { |
| 255 return new ExternalVideoSurfaceContainerImpl(web_contents); | 259 return new ExternalVideoSurfaceContainerImpl(web_contents); |
| 256 } | 260 } |
| 257 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE) | 261 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE) |
| 258 | 262 |
| 259 | 263 |
| 260 } // namespace shell | 264 } // namespace shell |
| 261 } // namespace chromecast | 265 } // namespace chromecast |
| OLD | NEW |