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 453 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
464 bool user_gesture, | 464 bool user_gesture, |
465 bool opener_suppressed, | 465 bool opener_suppressed, |
466 content::ResourceContext* context, | 466 content::ResourceContext* context, |
467 bool* no_javascript_access) { | 467 bool* no_javascript_access) { |
468 *no_javascript_access = true; | 468 *no_javascript_access = true; |
469 return false; | 469 return false; |
470 } | 470 } |
471 | 471 |
472 void CastContentBrowserClient::ExposeInterfacesToRenderer( | 472 void CastContentBrowserClient::ExposeInterfacesToRenderer( |
473 service_manager::InterfaceRegistry* registry, | 473 service_manager::InterfaceRegistry* registry, |
| 474 content::AssociatedInterfaceRegistry* associated_registry, |
474 content::RenderProcessHost* render_process_host) { | 475 content::RenderProcessHost* render_process_host) { |
475 registry->AddInterface( | 476 registry->AddInterface( |
476 base::Bind(&media::MediaCapsImpl::AddBinding, | 477 base::Bind(&media::MediaCapsImpl::AddBinding, |
477 base::Unretained(cast_browser_main_parts_->media_caps())), | 478 base::Unretained(cast_browser_main_parts_->media_caps())), |
478 base::ThreadTaskRunnerHandle::Get()); | 479 base::ThreadTaskRunnerHandle::Get()); |
479 } | 480 } |
480 | 481 |
481 void CastContentBrowserClient::RegisterInProcessServices( | 482 void CastContentBrowserClient::RegisterInProcessServices( |
482 StaticServiceMap* services) { | 483 StaticServiceMap* services) { |
483 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 484 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
568 process_type, dumps_path, false /* upload */); | 569 process_type, dumps_path, false /* upload */); |
569 // StartUploaderThread() even though upload is diferred. | 570 // StartUploaderThread() even though upload is diferred. |
570 // Breakpad-related memory is freed in the uploader thread. | 571 // Breakpad-related memory is freed in the uploader thread. |
571 crash_handler->StartUploaderThread(); | 572 crash_handler->StartUploaderThread(); |
572 return crash_handler; | 573 return crash_handler; |
573 } | 574 } |
574 #endif // !defined(OS_ANDROID) | 575 #endif // !defined(OS_ANDROID) |
575 | 576 |
576 } // namespace shell | 577 } // namespace shell |
577 } // namespace chromecast | 578 } // namespace chromecast |
OLD | NEW |