| 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 <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/base_switches.h" | 9 #include "base/base_switches.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 if (process_type == switches::kRendererProcess) { | 128 if (process_type == switches::kRendererProcess) { |
| 129 // Any browser command-line switches that should be propagated to | 129 // Any browser command-line switches that should be propagated to |
| 130 // the renderer go here. | 130 // the renderer go here. |
| 131 #if defined(OS_ANDROID) | 131 #if defined(OS_ANDROID) |
| 132 command_line->AppendSwitch(switches::kForceUseOverlayEmbeddedVideo); | 132 command_line->AppendSwitch(switches::kForceUseOverlayEmbeddedVideo); |
| 133 #endif // defined(OS_ANDROID) | 133 #endif // defined(OS_ANDROID) |
| 134 | 134 |
| 135 if (browser_command_line->HasSwitch(switches::kEnableCmaMediaPipeline)) | 135 if (browser_command_line->HasSwitch(switches::kEnableCmaMediaPipeline)) |
| 136 command_line->AppendSwitch(switches::kEnableCmaMediaPipeline); | 136 command_line->AppendSwitch(switches::kEnableCmaMediaPipeline); |
| 137 } | 137 } |
| 138 |
| 139 PlatformAppendExtraCommandLineSwitches(command_line); |
| 138 } | 140 } |
| 139 | 141 |
| 140 content::AccessTokenStore* CastContentBrowserClient::CreateAccessTokenStore() { | 142 content::AccessTokenStore* CastContentBrowserClient::CreateAccessTokenStore() { |
| 141 return new CastAccessTokenStore( | 143 return new CastAccessTokenStore( |
| 142 CastBrowserProcess::GetInstance()->browser_context()); | 144 CastBrowserProcess::GetInstance()->browser_context()); |
| 143 } | 145 } |
| 144 | 146 |
| 145 void CastContentBrowserClient::OverrideWebkitPrefs( | 147 void CastContentBrowserClient::OverrideWebkitPrefs( |
| 146 content::RenderViewHost* render_view_host, | 148 content::RenderViewHost* render_view_host, |
| 147 const GURL& url, | 149 const GURL& url, |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 336 process_type, dumps_path, false /* upload */); | 338 process_type, dumps_path, false /* upload */); |
| 337 // StartUploaderThread() even though upload is diferred. | 339 // StartUploaderThread() even though upload is diferred. |
| 338 // Breakpad-related memory is freed in the uploader thread. | 340 // Breakpad-related memory is freed in the uploader thread. |
| 339 crash_handler->StartUploaderThread(); | 341 crash_handler->StartUploaderThread(); |
| 340 return crash_handler; | 342 return crash_handler; |
| 341 } | 343 } |
| 342 #endif // !defined(OS_ANDROID) | 344 #endif // !defined(OS_ANDROID) |
| 343 | 345 |
| 344 } // namespace shell | 346 } // namespace shell |
| 345 } // namespace chromecast | 347 } // namespace chromecast |
| OLD | NEW |