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