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