Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(220)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 1408193003: Add chrome side webusb permission UI code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merged changes from master Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 269
270 #if defined(ENABLE_WEBRTC) 270 #if defined(ENABLE_WEBRTC)
271 #include "chrome/browser/media/webrtc_logging_handler_host.h" 271 #include "chrome/browser/media/webrtc_logging_handler_host.h"
272 #endif 272 #endif
273 273
274 #if defined(ENABLE_MEDIA_ROUTER) 274 #if defined(ENABLE_MEDIA_ROUTER)
275 #include "chrome/browser/media/router/media_router_feature.h" 275 #include "chrome/browser/media/router/media_router_feature.h"
276 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" 276 #include "chrome/browser/media/router/presentation_service_delegate_impl.h"
277 #endif 277 #endif
278 278
279 #if !defined(OS_ANDROID) && !defined(OS_IOS)
280 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h"
281 #endif
282
279 #if defined(ENABLE_WAYLAND_SERVER) 283 #if defined(ENABLE_WAYLAND_SERVER)
280 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" 284 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
281 #endif 285 #endif
282 286
283 using base::FileDescriptor; 287 using base::FileDescriptor;
284 using blink::WebWindowFeatures; 288 using blink::WebWindowFeatures;
285 using content::AccessTokenStore; 289 using content::AccessTokenStore;
286 using content::BrowserThread; 290 using content::BrowserThread;
287 using content::BrowserURLHandler; 291 using content::BrowserURLHandler;
288 using content::ChildProcessSecurityPolicy; 292 using content::ChildProcessSecurityPolicy;
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 if (!web_contents) { 652 if (!web_contents) {
649 NOTREACHED(); 653 NOTREACHED();
650 return; 654 return;
651 } 655 }
652 656
653 UsbTabHelper* tab_helper = 657 UsbTabHelper* tab_helper =
654 UsbTabHelper::GetOrCreateForWebContents(web_contents); 658 UsbTabHelper::GetOrCreateForWebContents(web_contents);
655 tab_helper->CreateDeviceManager(render_frame_host, request.Pass()); 659 tab_helper->CreateDeviceManager(render_frame_host, request.Pass());
656 } 660 }
657 661
662 #if !defined(OS_ANDROID) && !defined(OS_IOS)
663 void CreateWebUsbPermissionBubble(
664 RenderFrameHost* render_frame_host,
665 mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) {
666 WebContents* web_contents =
667 WebContents::FromRenderFrameHost(render_frame_host);
668 if (!web_contents) {
669 NOTREACHED();
670 return;
671 }
672
673 UsbTabHelper* tab_helper =
674 UsbTabHelper::GetOrCreateForWebContents(web_contents);
675 tab_helper->CreatePermissionBubble(render_frame_host, request.Pass());
676 }
677 #endif // !defined(OS_ANDROID) && !defined(OS_IOS)
678
658 } // namespace 679 } // namespace
659 680
660 ChromeContentBrowserClient::ChromeContentBrowserClient() 681 ChromeContentBrowserClient::ChromeContentBrowserClient()
661 : 682 :
662 weak_factory_(this) { 683 weak_factory_(this) {
663 #if defined(ENABLE_PLUGINS) 684 #if defined(ENABLE_PLUGINS)
664 for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i) 685 for (size_t i = 0; i < arraysize(kPredefinedAllowedDevChannelOrigins); ++i)
665 allowed_dev_channel_origins_.insert(kPredefinedAllowedDevChannelOrigins[i]); 686 allowed_dev_channel_origins_.insert(kPredefinedAllowedDevChannelOrigins[i]);
666 for (size_t i = 0; i < arraysize(kPredefinedAllowedFileHandleOrigins); ++i) 687 for (size_t i = 0; i < arraysize(kPredefinedAllowedFileHandleOrigins); ++i)
667 allowed_file_handle_origins_.insert(kPredefinedAllowedFileHandleOrigins[i]); 688 allowed_file_handle_origins_.insert(kPredefinedAllowedFileHandleOrigins[i]);
(...skipping 1935 matching lines...) Expand 10 before | Expand all | Expand 10 after
2603 registry->AddService( 2624 registry->AddService(
2604 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create, 2625 base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
2605 render_frame_host)); 2626 render_frame_host));
2606 #endif 2627 #endif
2607 } 2628 }
2608 2629
2609 void ChromeContentBrowserClient::RegisterRenderFrameMojoServices( 2630 void ChromeContentBrowserClient::RegisterRenderFrameMojoServices(
2610 content::ServiceRegistry* registry, 2631 content::ServiceRegistry* registry,
2611 content::RenderFrameHost* render_frame_host) { 2632 content::RenderFrameHost* render_frame_host) {
2612 registry->AddService(base::Bind(&CreateUsbDeviceManager, render_frame_host)); 2633 registry->AddService(base::Bind(&CreateUsbDeviceManager, render_frame_host));
2634 #if !defined(OS_ANDROID) && !defined(OS_IOS)
2635 registry->AddService(
2636 base::Bind(&CreateWebUsbPermissionBubble, render_frame_host));
2637 #endif // !defined(OS_ANDROID) && !defined(OS_IOS)
2613 } 2638 }
2614 2639
2615 void ChromeContentBrowserClient::RegisterOutOfProcessMojoApplications( 2640 void ChromeContentBrowserClient::RegisterOutOfProcessMojoApplications(
2616 OutOfProcessMojoApplicationMap* apps) { 2641 OutOfProcessMojoApplicationMap* apps) {
2617 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS) 2642 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
2618 apps->insert(std::make_pair(GURL("mojo:media"), 2643 apps->insert(std::make_pair(GURL("mojo:media"),
2619 base::ASCIIToUTF16("Media App"))); 2644 base::ASCIIToUTF16("Media App")));
2620 #endif 2645 #endif
2621 } 2646 }
2622 2647
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
2779 if (channel <= kMaxDisableEncryptionChannel) { 2804 if (channel <= kMaxDisableEncryptionChannel) {
2780 static const char* const kWebRtcDevSwitchNames[] = { 2805 static const char* const kWebRtcDevSwitchNames[] = {
2781 switches::kDisableWebRtcEncryption, 2806 switches::kDisableWebRtcEncryption,
2782 }; 2807 };
2783 to_command_line->CopySwitchesFrom(from_command_line, 2808 to_command_line->CopySwitchesFrom(from_command_line,
2784 kWebRtcDevSwitchNames, 2809 kWebRtcDevSwitchNames,
2785 arraysize(kWebRtcDevSwitchNames)); 2810 arraysize(kWebRtcDevSwitchNames));
2786 } 2811 }
2787 } 2812 }
2788 #endif // defined(ENABLE_WEBRTC) 2813 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698