OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
287 #if defined(ENABLE_WEBRTC) | 287 #if defined(ENABLE_WEBRTC) |
288 #include "chrome/browser/media/webrtc_logging_handler_host.h" | 288 #include "chrome/browser/media/webrtc_logging_handler_host.h" |
289 #endif | 289 #endif |
290 | 290 |
291 #if defined(ENABLE_MEDIA_ROUTER) | 291 #if defined(ENABLE_MEDIA_ROUTER) |
292 #include "chrome/browser/media/router/media_router_feature.h" | 292 #include "chrome/browser/media/router/media_router_feature.h" |
293 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" | 293 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" |
294 #endif | 294 #endif |
295 | 295 |
296 #if !defined(OS_ANDROID) | 296 #if !defined(OS_ANDROID) |
297 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h" | 297 #include "device/usb/public/interfaces/chooser_service.mojom.h" |
298 #endif | 298 #endif |
299 | 299 |
300 #if defined(ENABLE_WAYLAND_SERVER) | 300 #if defined(ENABLE_WAYLAND_SERVER) |
301 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" | 301 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" |
302 #endif | 302 #endif |
303 | 303 |
304 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 304 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
305 #include "media/mojo/services/mojo_media_application_factory.h" | 305 #include "media/mojo/services/mojo_media_application_factory.h" |
306 #endif | 306 #endif |
307 | 307 |
(...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
683 NOTREACHED(); | 683 NOTREACHED(); |
684 return; | 684 return; |
685 } | 685 } |
686 | 686 |
687 UsbTabHelper* tab_helper = | 687 UsbTabHelper* tab_helper = |
688 UsbTabHelper::GetOrCreateForWebContents(web_contents); | 688 UsbTabHelper::GetOrCreateForWebContents(web_contents); |
689 tab_helper->CreateDeviceManager(render_frame_host, std::move(request)); | 689 tab_helper->CreateDeviceManager(render_frame_host, std::move(request)); |
690 } | 690 } |
691 | 691 |
692 #if !defined(OS_ANDROID) | 692 #if !defined(OS_ANDROID) |
693 void CreateWebUsbPermissionBubble( | 693 void CreateWebUsbChooserService( |
694 RenderFrameHost* render_frame_host, | 694 RenderFrameHost* render_frame_host, |
695 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { | 695 mojo::InterfaceRequest<device::usb::ChooserService> request) { |
696 WebContents* web_contents = | 696 WebContents* web_contents = |
697 WebContents::FromRenderFrameHost(render_frame_host); | 697 WebContents::FromRenderFrameHost(render_frame_host); |
698 if (!web_contents) { | 698 if (!web_contents) { |
699 NOTREACHED(); | 699 NOTREACHED(); |
700 return; | 700 return; |
701 } | 701 } |
702 | 702 |
703 UsbTabHelper* tab_helper = | 703 UsbTabHelper* tab_helper = |
704 UsbTabHelper::GetOrCreateForWebContents(web_contents); | 704 UsbTabHelper::GetOrCreateForWebContents(web_contents); |
705 tab_helper->CreatePermissionBubble(render_frame_host, std::move(request)); | 705 tab_helper->CreateChooserService(render_frame_host, std::move(request)); |
706 } | 706 } |
707 #endif // !defined(OS_ANDROID) | 707 #endif // !defined(OS_ANDROID) |
708 | 708 |
709 bool GetDataSaverEnabledPref(const PrefService* prefs) { | 709 bool GetDataSaverEnabledPref(const PrefService* prefs) { |
710 // Enable data saver only when data saver pref is enabled and not part of | 710 // Enable data saver only when data saver pref is enabled and not part of |
711 // "Disabled" group of "SaveDataHeader" experiment. | 711 // "Disabled" group of "SaveDataHeader" experiment. |
712 return prefs->GetBoolean(prefs::kDataSaverEnabled) && | 712 return prefs->GetBoolean(prefs::kDataSaverEnabled) && |
713 base::FieldTrialList::FindFullName("SaveDataHeader") | 713 base::FieldTrialList::FindFullName("SaveDataHeader") |
714 .compare("Disabled"); | 714 .compare("Disabled"); |
715 } | 715 } |
(...skipping 2069 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2785 render_frame_host)); | 2785 render_frame_host)); |
2786 #endif | 2786 #endif |
2787 } | 2787 } |
2788 | 2788 |
2789 void ChromeContentBrowserClient::RegisterRenderFrameMojoServices( | 2789 void ChromeContentBrowserClient::RegisterRenderFrameMojoServices( |
2790 content::ServiceRegistry* registry, | 2790 content::ServiceRegistry* registry, |
2791 content::RenderFrameHost* render_frame_host) { | 2791 content::RenderFrameHost* render_frame_host) { |
2792 registry->AddService(base::Bind(&CreateUsbDeviceManager, render_frame_host)); | 2792 registry->AddService(base::Bind(&CreateUsbDeviceManager, render_frame_host)); |
2793 #if !defined(OS_ANDROID) | 2793 #if !defined(OS_ANDROID) |
2794 registry->AddService( | 2794 registry->AddService( |
2795 base::Bind(&CreateWebUsbPermissionBubble, render_frame_host)); | 2795 base::Bind(&CreateWebUsbChooserService, render_frame_host)); |
2796 #endif // !defined(OS_ANDROID) | 2796 #endif // !defined(OS_ANDROID) |
2797 } | 2797 } |
2798 | 2798 |
2799 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( | 2799 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( |
2800 StaticMojoApplicationMap* apps) { | 2800 StaticMojoApplicationMap* apps) { |
2801 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 2801 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
2802 apps->insert(std::make_pair(GURL("mojo:media"), | 2802 apps->insert(std::make_pair(GURL("mojo:media"), |
2803 base::Bind(&media::CreateMojoMediaApplication))); | 2803 base::Bind(&media::CreateMojoMediaApplication))); |
2804 #endif | 2804 #endif |
2805 } | 2805 } |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2968 if (channel <= kMaxDisableEncryptionChannel) { | 2968 if (channel <= kMaxDisableEncryptionChannel) { |
2969 static const char* const kWebRtcDevSwitchNames[] = { | 2969 static const char* const kWebRtcDevSwitchNames[] = { |
2970 switches::kDisableWebRtcEncryption, | 2970 switches::kDisableWebRtcEncryption, |
2971 }; | 2971 }; |
2972 to_command_line->CopySwitchesFrom(from_command_line, | 2972 to_command_line->CopySwitchesFrom(from_command_line, |
2973 kWebRtcDevSwitchNames, | 2973 kWebRtcDevSwitchNames, |
2974 arraysize(kWebRtcDevSwitchNames)); | 2974 arraysize(kWebRtcDevSwitchNames)); |
2975 } | 2975 } |
2976 } | 2976 } |
2977 #endif // defined(ENABLE_WEBRTC) | 2977 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |