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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 #include "components/crash/content/browser/crash_dump_manager_android.h" | 70 #include "components/crash/content/browser/crash_dump_manager_android.h" |
71 #else | 71 #else |
72 #include "chromecast/browser/media/cast_browser_cdm_factory.h" | 72 #include "chromecast/browser/media/cast_browser_cdm_factory.h" |
73 #endif // defined(OS_ANDROID) | 73 #endif // defined(OS_ANDROID) |
74 | 74 |
75 namespace chromecast { | 75 namespace chromecast { |
76 namespace shell { | 76 namespace shell { |
77 | 77 |
78 namespace { | 78 namespace { |
79 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 79 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
80 static std::unique_ptr<::shell::Service> CreateMojoMediaApplication( | 80 static std::unique_ptr<service_manager::Service> CreateMojoMediaApplication( |
81 CastContentBrowserClient* browser_client, | 81 CastContentBrowserClient* browser_client, |
82 const base::Closure& quit_closure) { | 82 const base::Closure& quit_closure) { |
83 std::unique_ptr<media::CastMojoMediaClient> mojo_media_client( | 83 std::unique_ptr<media::CastMojoMediaClient> mojo_media_client( |
84 new media::CastMojoMediaClient( | 84 new media::CastMojoMediaClient( |
85 base::Bind(&CastContentBrowserClient::CreateMediaPipelineBackend, | 85 base::Bind(&CastContentBrowserClient::CreateMediaPipelineBackend, |
86 base::Unretained(browser_client)), | 86 base::Unretained(browser_client)), |
87 base::Bind(&CastContentBrowserClient::CreateCdmFactory, | 87 base::Bind(&CastContentBrowserClient::CreateCdmFactory, |
88 base::Unretained(browser_client)), | 88 base::Unretained(browser_client)), |
89 browser_client->GetVideoResolutionPolicy(), | 89 browser_client->GetVideoResolutionPolicy(), |
90 browser_client->media_resource_tracker())); | 90 browser_client->media_resource_tracker())); |
91 return std::unique_ptr<::shell::Service>( | 91 return std::unique_ptr<service_manager::Service>( |
92 new ::media::MojoMediaApplication(std::move(mojo_media_client), | 92 new ::media::MojoMediaApplication(std::move(mojo_media_client), |
93 quit_closure)); | 93 quit_closure)); |
94 } | 94 } |
95 #endif // defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 95 #endif // defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
96 | 96 |
97 } // namespace | 97 } // namespace |
98 | 98 |
99 CastContentBrowserClient::CastContentBrowserClient() | 99 CastContentBrowserClient::CastContentBrowserClient() |
100 : cast_browser_main_parts_(nullptr), | 100 : cast_browser_main_parts_(nullptr), |
101 url_request_context_factory_(new URLRequestContextFactory()) {} | 101 url_request_context_factory_(new URLRequestContextFactory()) {} |
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
409 content::ResourceContext* context, | 409 content::ResourceContext* context, |
410 int render_process_id, | 410 int render_process_id, |
411 int opener_render_view_id, | 411 int opener_render_view_id, |
412 int opener_render_frame_id, | 412 int opener_render_frame_id, |
413 bool* no_javascript_access) { | 413 bool* no_javascript_access) { |
414 *no_javascript_access = true; | 414 *no_javascript_access = true; |
415 return false; | 415 return false; |
416 } | 416 } |
417 | 417 |
418 void CastContentBrowserClient::ExposeInterfacesToRenderer( | 418 void CastContentBrowserClient::ExposeInterfacesToRenderer( |
419 ::shell::InterfaceRegistry* registry, | 419 service_manager::InterfaceRegistry* registry, |
420 content::RenderProcessHost* render_process_host) { | 420 content::RenderProcessHost* render_process_host) { |
421 registry->AddInterface( | 421 registry->AddInterface( |
422 base::Bind(&media::MediaCapsImpl::AddBinding, | 422 base::Bind(&media::MediaCapsImpl::AddBinding, |
423 base::Unretained(cast_browser_main_parts_->media_caps())), | 423 base::Unretained(cast_browser_main_parts_->media_caps())), |
424 base::ThreadTaskRunnerHandle::Get()); | 424 base::ThreadTaskRunnerHandle::Get()); |
425 } | 425 } |
426 | 426 |
427 void CastContentBrowserClient::RegisterInProcessServices( | 427 void CastContentBrowserClient::RegisterInProcessServices( |
428 StaticServiceMap* services) { | 428 StaticServiceMap* services) { |
429 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 429 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
549 process_type, dumps_path, false /* upload */); | 549 process_type, dumps_path, false /* upload */); |
550 // StartUploaderThread() even though upload is diferred. | 550 // StartUploaderThread() even though upload is diferred. |
551 // Breakpad-related memory is freed in the uploader thread. | 551 // Breakpad-related memory is freed in the uploader thread. |
552 crash_handler->StartUploaderThread(); | 552 crash_handler->StartUploaderThread(); |
553 return crash_handler; | 553 return crash_handler; |
554 } | 554 } |
555 #endif // !defined(OS_ANDROID) | 555 #endif // !defined(OS_ANDROID) |
556 | 556 |
557 } // namespace shell | 557 } // namespace shell |
558 } // namespace chromecast | 558 } // namespace chromecast |
OLD | NEW |