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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 #include "content/public/browser/resource_context.h" | 145 #include "content/public/browser/resource_context.h" |
146 #include "content/public/browser/site_instance.h" | 146 #include "content/public/browser/site_instance.h" |
147 #include "content/public/browser/web_contents.h" | 147 #include "content/public/browser/web_contents.h" |
148 #include "content/public/common/child_process_host.h" | 148 #include "content/public/common/child_process_host.h" |
149 #include "content/public/common/content_descriptors.h" | 149 #include "content/public/common/content_descriptors.h" |
150 #include "content/public/common/content_switches.h" | 150 #include "content/public/common/content_switches.h" |
151 #include "content/public/common/sandbox_type.h" | 151 #include "content/public/common/sandbox_type.h" |
152 #include "content/public/common/service_registry.h" | 152 #include "content/public/common/service_registry.h" |
153 #include "content/public/common/url_utils.h" | 153 #include "content/public/common/url_utils.h" |
154 #include "content/public/common/web_preferences.h" | 154 #include "content/public/common/web_preferences.h" |
| 155 #include "device/usb/public/interfaces/chooser_service.mojom.h" |
155 #include "device/usb/public/interfaces/device_manager.mojom.h" | 156 #include "device/usb/public/interfaces/device_manager.mojom.h" |
156 #include "gin/v8_initializer.h" | 157 #include "gin/v8_initializer.h" |
157 #include "mojo/shell/public/cpp/shell_client.h" | 158 #include "mojo/shell/public/cpp/shell_client.h" |
158 #include "net/base/mime_util.h" | 159 #include "net/base/mime_util.h" |
159 #include "net/cookies/canonical_cookie.h" | 160 #include "net/cookies/canonical_cookie.h" |
160 #include "net/cookies/cookie_options.h" | 161 #include "net/cookies/cookie_options.h" |
161 #include "net/ssl/ssl_cert_request_info.h" | 162 #include "net/ssl/ssl_cert_request_info.h" |
162 #include "ppapi/host/ppapi_host.h" | 163 #include "ppapi/host/ppapi_host.h" |
163 #include "storage/browser/fileapi/external_mount_points.h" | 164 #include "storage/browser/fileapi/external_mount_points.h" |
164 #include "ui/base/l10n/l10n_util.h" | 165 #include "ui/base/l10n/l10n_util.h" |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
284 | 285 |
285 #if defined(ENABLE_WEBRTC) | 286 #if defined(ENABLE_WEBRTC) |
286 #include "chrome/browser/media/webrtc_logging_handler_host.h" | 287 #include "chrome/browser/media/webrtc_logging_handler_host.h" |
287 #endif | 288 #endif |
288 | 289 |
289 #if defined(ENABLE_MEDIA_ROUTER) | 290 #if defined(ENABLE_MEDIA_ROUTER) |
290 #include "chrome/browser/media/router/media_router_feature.h" | 291 #include "chrome/browser/media/router/media_router_feature.h" |
291 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" | 292 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" |
292 #endif | 293 #endif |
293 | 294 |
294 #if !defined(OS_ANDROID) | |
295 #include "device/usb/public/interfaces/chooser_service.mojom.h" | |
296 #endif | |
297 | |
298 #if defined(ENABLE_WAYLAND_SERVER) | 295 #if defined(ENABLE_WAYLAND_SERVER) |
299 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" | 296 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" |
300 #endif | 297 #endif |
301 | 298 |
302 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 299 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
303 #include "media/mojo/services/mojo_media_application_factory.h" | 300 #include "media/mojo/services/mojo_media_application_factory.h" |
304 #endif | 301 #endif |
305 | 302 |
306 using base::FileDescriptor; | 303 using base::FileDescriptor; |
307 using blink::WebWindowFeatures; | 304 using blink::WebWindowFeatures; |
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
674 if (!web_contents) { | 671 if (!web_contents) { |
675 NOTREACHED(); | 672 NOTREACHED(); |
676 return; | 673 return; |
677 } | 674 } |
678 | 675 |
679 UsbTabHelper* tab_helper = | 676 UsbTabHelper* tab_helper = |
680 UsbTabHelper::GetOrCreateForWebContents(web_contents); | 677 UsbTabHelper::GetOrCreateForWebContents(web_contents); |
681 tab_helper->CreateDeviceManager(render_frame_host, std::move(request)); | 678 tab_helper->CreateDeviceManager(render_frame_host, std::move(request)); |
682 } | 679 } |
683 | 680 |
684 #if !defined(OS_ANDROID) | |
685 void CreateWebUsbChooserService( | 681 void CreateWebUsbChooserService( |
686 RenderFrameHost* render_frame_host, | 682 RenderFrameHost* render_frame_host, |
687 mojo::InterfaceRequest<device::usb::ChooserService> request) { | 683 mojo::InterfaceRequest<device::usb::ChooserService> request) { |
688 WebContents* web_contents = | 684 WebContents* web_contents = |
689 WebContents::FromRenderFrameHost(render_frame_host); | 685 WebContents::FromRenderFrameHost(render_frame_host); |
690 if (!web_contents) { | 686 if (!web_contents) { |
691 NOTREACHED(); | 687 NOTREACHED(); |
692 return; | 688 return; |
693 } | 689 } |
694 | 690 |
695 UsbTabHelper* tab_helper = | 691 UsbTabHelper* tab_helper = |
696 UsbTabHelper::GetOrCreateForWebContents(web_contents); | 692 UsbTabHelper::GetOrCreateForWebContents(web_contents); |
697 tab_helper->CreateChooserService(render_frame_host, std::move(request)); | 693 tab_helper->CreateChooserService(render_frame_host, std::move(request)); |
698 } | 694 } |
699 #endif // !defined(OS_ANDROID) | |
700 | 695 |
701 bool GetDataSaverEnabledPref(const PrefService* prefs) { | 696 bool GetDataSaverEnabledPref(const PrefService* prefs) { |
702 // Enable data saver only when data saver pref is enabled and not part of | 697 // Enable data saver only when data saver pref is enabled and not part of |
703 // "Disabled" group of "SaveDataHeader" experiment. | 698 // "Disabled" group of "SaveDataHeader" experiment. |
704 return prefs->GetBoolean(prefs::kDataSaverEnabled) && | 699 return prefs->GetBoolean(prefs::kDataSaverEnabled) && |
705 base::FieldTrialList::FindFullName("SaveDataHeader") | 700 base::FieldTrialList::FindFullName("SaveDataHeader") |
706 .compare("Disabled"); | 701 .compare("Disabled"); |
707 } | 702 } |
708 | 703 |
709 } // namespace | 704 } // namespace |
(...skipping 2047 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2757 registry->AddService( | 2752 registry->AddService( |
2758 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, | 2753 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, |
2759 render_frame_host)); | 2754 render_frame_host)); |
2760 #endif | 2755 #endif |
2761 } | 2756 } |
2762 | 2757 |
2763 void ChromeContentBrowserClient::RegisterRenderFrameMojoServices( | 2758 void ChromeContentBrowserClient::RegisterRenderFrameMojoServices( |
2764 content::ServiceRegistry* registry, | 2759 content::ServiceRegistry* registry, |
2765 content::RenderFrameHost* render_frame_host) { | 2760 content::RenderFrameHost* render_frame_host) { |
2766 registry->AddService(base::Bind(&CreateUsbDeviceManager, render_frame_host)); | 2761 registry->AddService(base::Bind(&CreateUsbDeviceManager, render_frame_host)); |
2767 #if !defined(OS_ANDROID) | |
2768 registry->AddService( | 2762 registry->AddService( |
2769 base::Bind(&CreateWebUsbChooserService, render_frame_host)); | 2763 base::Bind(&CreateWebUsbChooserService, render_frame_host)); |
2770 #endif // !defined(OS_ANDROID) | |
2771 } | 2764 } |
2772 | 2765 |
2773 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( | 2766 void ChromeContentBrowserClient::RegisterInProcessMojoApplications( |
2774 StaticMojoApplicationMap* apps) { | 2767 StaticMojoApplicationMap* apps) { |
2775 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 2768 #if (ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
2776 apps->insert(std::make_pair(GURL("mojo:media"), | 2769 apps->insert(std::make_pair(GURL("mojo:media"), |
2777 base::Bind(&media::CreateMojoMediaApplication))); | 2770 base::Bind(&media::CreateMojoMediaApplication))); |
2778 #endif | 2771 #endif |
2779 } | 2772 } |
2780 | 2773 |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2942 if (channel <= kMaxDisableEncryptionChannel) { | 2935 if (channel <= kMaxDisableEncryptionChannel) { |
2943 static const char* const kWebRtcDevSwitchNames[] = { | 2936 static const char* const kWebRtcDevSwitchNames[] = { |
2944 switches::kDisableWebRtcEncryption, | 2937 switches::kDisableWebRtcEncryption, |
2945 }; | 2938 }; |
2946 to_command_line->CopySwitchesFrom(from_command_line, | 2939 to_command_line->CopySwitchesFrom(from_command_line, |
2947 kWebRtcDevSwitchNames, | 2940 kWebRtcDevSwitchNames, |
2948 arraysize(kWebRtcDevSwitchNames)); | 2941 arraysize(kWebRtcDevSwitchNames)); |
2949 } | 2942 } |
2950 } | 2943 } |
2951 #endif // defined(ENABLE_WEBRTC) | 2944 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |