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 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
280 #if defined(ENABLE_WEBRTC) | 280 #if defined(ENABLE_WEBRTC) |
281 #include "chrome/browser/media/webrtc_logging_handler_host.h" | 281 #include "chrome/browser/media/webrtc_logging_handler_host.h" |
282 #endif | 282 #endif |
283 | 283 |
284 #if defined(ENABLE_MEDIA_ROUTER) | 284 #if defined(ENABLE_MEDIA_ROUTER) |
285 #include "chrome/browser/media/router/media_router_feature.h" | 285 #include "chrome/browser/media/router/media_router_feature.h" |
286 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" | 286 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" |
287 #endif | 287 #endif |
288 | 288 |
289 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 289 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
290 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h" | 290 #include "content/public/common/web_usb_permission_request.mojom.h" |
291 #endif | 291 #endif |
292 | 292 |
293 #if defined(ENABLE_WAYLAND_SERVER) | 293 #if defined(ENABLE_WAYLAND_SERVER) |
294 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" | 294 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" |
295 #endif | 295 #endif |
296 | 296 |
297 using base::FileDescriptor; | 297 using base::FileDescriptor; |
298 using blink::WebWindowFeatures; | 298 using blink::WebWindowFeatures; |
299 using content::AccessTokenStore; | 299 using content::AccessTokenStore; |
300 using content::BrowserThread; | 300 using content::BrowserThread; |
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
666 NOTREACHED(); | 666 NOTREACHED(); |
667 return; | 667 return; |
668 } | 668 } |
669 | 669 |
670 UsbTabHelper* tab_helper = | 670 UsbTabHelper* tab_helper = |
671 UsbTabHelper::GetOrCreateForWebContents(web_contents); | 671 UsbTabHelper::GetOrCreateForWebContents(web_contents); |
672 tab_helper->CreateDeviceManager(render_frame_host, std::move(request)); | 672 tab_helper->CreateDeviceManager(render_frame_host, std::move(request)); |
673 } | 673 } |
674 | 674 |
675 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 675 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
676 void CreateWebUsbPermissionBubble( | 676 void CreateWebUsbPermissionRequest( |
677 RenderFrameHost* render_frame_host, | 677 RenderFrameHost* render_frame_host, |
678 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { | 678 mojo::InterfaceRequest<content::WebUsbPermissionRequest> request) { |
679 WebContents* web_contents = | 679 WebContents* web_contents = |
680 WebContents::FromRenderFrameHost(render_frame_host); | 680 WebContents::FromRenderFrameHost(render_frame_host); |
681 if (!web_contents) { | 681 if (!web_contents) { |
682 NOTREACHED(); | 682 NOTREACHED(); |
683 return; | 683 return; |
684 } | 684 } |
685 | 685 |
686 UsbTabHelper* tab_helper = | 686 UsbTabHelper* tab_helper = |
687 UsbTabHelper::GetOrCreateForWebContents(web_contents); | 687 UsbTabHelper::GetOrCreateForWebContents(web_contents); |
688 tab_helper->CreatePermissionBubble(render_frame_host, std::move(request)); | 688 tab_helper->CreatePermissionRequest(render_frame_host, std::move(request)); |
689 } | 689 } |
690 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) | 690 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) |
691 | 691 |
692 } // namespace | 692 } // namespace |
693 | 693 |
694 ChromeContentBrowserClient::ChromeContentBrowserClient() | 694 ChromeContentBrowserClient::ChromeContentBrowserClient() |
695 : | 695 : |
696 weak_factory_(this) { | 696 weak_factory_(this) { |
697 #if defined(ENABLE_PLUGINS) | 697 #if defined(ENABLE_PLUGINS) |
698 for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i) | 698 for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i) |
(...skipping 1952 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2651 render_frame_host)); | 2651 render_frame_host)); |
2652 #endif | 2652 #endif |
2653 } | 2653 } |
2654 | 2654 |
2655 void ChromeContentBrowserClient::RegisterRenderFrameMojoServices( | 2655 void ChromeContentBrowserClient::RegisterRenderFrameMojoServices( |
2656 content::ServiceRegistry* registry, | 2656 content::ServiceRegistry* registry, |
2657 content::RenderFrameHost* render_frame_host) { | 2657 content::RenderFrameHost* render_frame_host) { |
2658 registry->AddService(base::Bind(&CreateUsbDeviceManager, render_frame_host)); | 2658 registry->AddService(base::Bind(&CreateUsbDeviceManager, render_frame_host)); |
2659 #if !defined(OS_ANDROID) && !defined(OS_IOS) | 2659 #if !defined(OS_ANDROID) && !defined(OS_IOS) |
2660 registry->AddService( | 2660 registry->AddService( |
2661 base::Bind(&CreateWebUsbPermissionBubble, render_frame_host)); | 2661 base::Bind(&CreateWebUsbPermissionRequest, render_frame_host)); |
2662 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) | 2662 #endif // !defined(OS_ANDROID) && !defined(OS_IOS) |
2663 } | 2663 } |
2664 | 2664 |
2665 void ChromeContentBrowserClient::RegisterOutOfProcessMojoApplications( | 2665 void ChromeContentBrowserClient::RegisterOutOfProcessMojoApplications( |
2666 OutOfProcessMojoApplicationMap* apps) { | 2666 OutOfProcessMojoApplicationMap* apps) { |
2667 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) | 2667 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) |
2668 apps->insert(std::make_pair(GURL("mojo:media"), | 2668 apps->insert(std::make_pair(GURL("mojo:media"), |
2669 base::ASCIIToUTF16("Media App"))); | 2669 base::ASCIIToUTF16("Media App"))); |
2670 #endif | 2670 #endif |
2671 } | 2671 } |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2828 if (channel <= kMaxDisableEncryptionChannel) { | 2828 if (channel <= kMaxDisableEncryptionChannel) { |
2829 static const char* const kWebRtcDevSwitchNames[] = { | 2829 static const char* const kWebRtcDevSwitchNames[] = { |
2830 switches::kDisableWebRtcEncryption, | 2830 switches::kDisableWebRtcEncryption, |
2831 }; | 2831 }; |
2832 to_command_line->CopySwitchesFrom(from_command_line, | 2832 to_command_line->CopySwitchesFrom(from_command_line, |
2833 kWebRtcDevSwitchNames, | 2833 kWebRtcDevSwitchNames, |
2834 arraysize(kWebRtcDevSwitchNames)); | 2834 arraysize(kWebRtcDevSwitchNames)); |
2835 } | 2835 } |
2836 } | 2836 } |
2837 #endif // defined(ENABLE_WEBRTC) | 2837 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |