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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 #include "ui/display/screen.h" | 57 #include "ui/display/screen.h" |
58 #include "ui/gl/gl_switches.h" | 58 #include "ui/gl/gl_switches.h" |
59 | 59 |
60 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 60 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
61 #include "chromecast/browser/media/cast_mojo_media_client.h" | 61 #include "chromecast/browser/media/cast_mojo_media_client.h" |
62 #include "media/mojo/services/mojo_media_application.h" // nogncheck | 62 #include "media/mojo/services/mojo_media_application.h" // nogncheck |
63 #endif // ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS | 63 #endif // ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS |
64 | 64 |
65 #if defined(OS_ANDROID) | 65 #if defined(OS_ANDROID) |
66 #include "components/crash/content/browser/crash_dump_manager_android.h" | 66 #include "components/crash/content/browser/crash_dump_manager_android.h" |
67 #include "components/external_video_surface/browser/android/external_video_surfa
ce_container_impl.h" | |
68 #else | 67 #else |
69 #include "chromecast/browser/media/cast_browser_cdm_factory.h" | 68 #include "chromecast/browser/media/cast_browser_cdm_factory.h" |
70 #endif // defined(OS_ANDROID) | 69 #endif // defined(OS_ANDROID) |
71 | 70 |
72 namespace chromecast { | 71 namespace chromecast { |
73 namespace shell { | 72 namespace shell { |
74 | 73 |
75 namespace { | 74 namespace { |
76 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 75 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
77 static std::unique_ptr<::shell::Service> CreateMojoMediaApplication( | 76 static std::unique_ptr<::shell::Service> CreateMojoMediaApplication( |
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
485 } | 484 } |
486 } | 485 } |
487 | 486 |
488 #endif // defined(OS_ANDROID) | 487 #endif // defined(OS_ANDROID) |
489 | 488 |
490 void CastContentBrowserClient::GetAdditionalWebUISchemes( | 489 void CastContentBrowserClient::GetAdditionalWebUISchemes( |
491 std::vector<std::string>* additional_schemes) { | 490 std::vector<std::string>* additional_schemes) { |
492 additional_schemes->push_back(kChromeResourceScheme); | 491 additional_schemes->push_back(kChromeResourceScheme); |
493 } | 492 } |
494 | 493 |
495 #if defined(OS_ANDROID) && defined(VIDEO_HOLE) | |
496 content::ExternalVideoSurfaceContainer* | |
497 CastContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer( | |
498 content::WebContents* web_contents) { | |
499 return external_video_surface::ExternalVideoSurfaceContainerImpl::Create( | |
500 web_contents); | |
501 } | |
502 #endif // defined(OS_ANDROID) && defined(VIDEO_HOLE) | |
503 | |
504 content::DevToolsManagerDelegate* | 494 content::DevToolsManagerDelegate* |
505 CastContentBrowserClient::GetDevToolsManagerDelegate() { | 495 CastContentBrowserClient::GetDevToolsManagerDelegate() { |
506 return new CastDevToolsDelegate(); | 496 return new CastDevToolsDelegate(); |
507 } | 497 } |
508 | 498 |
509 #if !defined(OS_ANDROID) | 499 #if !defined(OS_ANDROID) |
510 int CastContentBrowserClient::GetCrashSignalFD( | 500 int CastContentBrowserClient::GetCrashSignalFD( |
511 const base::CommandLine& command_line) { | 501 const base::CommandLine& command_line) { |
512 std::string process_type = | 502 std::string process_type = |
513 command_line.GetSwitchValueASCII(switches::kProcessType); | 503 command_line.GetSwitchValueASCII(switches::kProcessType); |
(...skipping 27 matching lines...) Expand all Loading... |
541 process_type, dumps_path, false /* upload */); | 531 process_type, dumps_path, false /* upload */); |
542 // StartUploaderThread() even though upload is diferred. | 532 // StartUploaderThread() even though upload is diferred. |
543 // Breakpad-related memory is freed in the uploader thread. | 533 // Breakpad-related memory is freed in the uploader thread. |
544 crash_handler->StartUploaderThread(); | 534 crash_handler->StartUploaderThread(); |
545 return crash_handler; | 535 return crash_handler; |
546 } | 536 } |
547 #endif // !defined(OS_ANDROID) | 537 #endif // !defined(OS_ANDROID) |
548 | 538 |
549 } // namespace shell | 539 } // namespace shell |
550 } // namespace chromecast | 540 } // namespace chromecast |
OLD | NEW |