| 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 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 if (crash_signal_fd >= 0) { | 320 if (crash_signal_fd >= 0) { |
| 321 mappings->Share(kCrashDumpSignal, crash_signal_fd); | 321 mappings->Share(kCrashDumpSignal, crash_signal_fd); |
| 322 } | 322 } |
| 323 #endif // defined(OS_ANDROID) | 323 #endif // defined(OS_ANDROID) |
| 324 } | 324 } |
| 325 | 325 |
| 326 #if defined(OS_ANDROID) && defined(VIDEO_HOLE) | 326 #if defined(OS_ANDROID) && defined(VIDEO_HOLE) |
| 327 content::ExternalVideoSurfaceContainer* | 327 content::ExternalVideoSurfaceContainer* |
| 328 CastContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( | 328 CastContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( |
| 329 content::WebContents* web_contents) { | 329 content::WebContents* web_contents) { |
| 330 return new ExternalVideoSurfaceContainerImpl(web_contents); | 330 return ExternalVideoSurfaceContainerImpl::Create(web_contents); |
| 331 } | 331 } |
| 332 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE) | 332 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE) |
| 333 | 333 |
| 334 #if !defined(OS_ANDROID) | 334 #if !defined(OS_ANDROID) |
| 335 int CastContentBrowserClient::GetCrashSignalFD( | 335 int CastContentBrowserClient::GetCrashSignalFD( |
| 336 const base::CommandLine& command_line) { | 336 const base::CommandLine& command_line) { |
| 337 std::string process_type = | 337 std::string process_type = |
| 338 command_line.GetSwitchValueASCII(switches::kProcessType); | 338 command_line.GetSwitchValueASCII(switches::kProcessType); |
| 339 | 339 |
| 340 if (process_type == switches::kRendererProcess || | 340 if (process_type == switches::kRendererProcess || |
| (...skipping 24 matching lines...) Expand all Loading... |
| 365 process_type, dumps_path, false /* upload */); | 365 process_type, dumps_path, false /* upload */); |
| 366 // StartUploaderThread() even though upload is diferred. | 366 // StartUploaderThread() even though upload is diferred. |
| 367 // Breakpad-related memory is freed in the uploader thread. | 367 // Breakpad-related memory is freed in the uploader thread. |
| 368 crash_handler->StartUploaderThread(); | 368 crash_handler->StartUploaderThread(); |
| 369 return crash_handler; | 369 return crash_handler; |
| 370 } | 370 } |
| 371 #endif // !defined(OS_ANDROID) | 371 #endif // !defined(OS_ANDROID) |
| 372 | 372 |
| 373 } // namespace shell | 373 } // namespace shell |
| 374 } // namespace chromecast | 374 } // namespace chromecast |
| OLD | NEW |