Chromium Code Reviews| Index: chrome/browser/chrome_content_browser_client.cc |
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
| index a9c79916295aebbe951282d1dd1d33ce3c33d9ba..c72d8a0ad87d6eca388f335aaee404278bbee161 100644 |
| --- a/chrome/browser/chrome_content_browser_client.cc |
| +++ b/chrome/browser/chrome_content_browser_client.cc |
| @@ -272,6 +272,10 @@ |
| #include "chrome/browser/media/router/presentation_service_delegate_impl.h" |
| #endif |
| +#if !defined(OS_ANDROID) && !defined(OS_IOS) |
| +#include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h" |
| +#endif |
| + |
| using base::FileDescriptor; |
| using blink::WebWindowFeatures; |
| using content::AccessTokenStore; |
| @@ -647,6 +651,23 @@ void CreateUsbDeviceManager( |
| #endif // !defined(OS_ANDROID) && !defined(OS_IOS) |
| } |
| +#if !defined(OS_ANDROID) && !defined(OS_IOS) |
| +void CreateWebUsbPermissionBubble( |
| + RenderFrameHost* render_frame_host, |
| + mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) { |
| + WebContents* web_contents = |
| + WebContents::FromRenderFrameHost(render_frame_host); |
| + if (!web_contents) { |
| + NOTREACHED(); |
| + return; |
| + } |
| + |
| + UsbTabHelper* tab_helper = |
| + UsbTabHelper::GetOrCreateForWebContents(web_contents); |
| + tab_helper->CreatePermissionBubble(render_frame_host, request.Pass()); |
| +} |
| +#endif |
| + |
| } // namespace |
| ChromeContentBrowserClient::ChromeContentBrowserClient() |
| @@ -2586,6 +2607,10 @@ void ChromeContentBrowserClient::RegisterRenderFrameMojoServices( |
| content::ServiceRegistry* registry, |
| content::RenderFrameHost* render_frame_host) { |
| registry->AddService(base::Bind(&CreateUsbDeviceManager, render_frame_host)); |
| +#if !defined(OS_ANDROID) && !defined(OS_IOS) |
|
Reilly Grant (use Gerrit)
2015/10/29 01:11:32
It is possible, like for DeviceManager, to avoid t
juncai
2015/10/31 04:15:36
Tried moving webusb.gypi to be included in all pla
|
| + registry->AddService( |
| + base::Bind(&CreateWebUsbPermissionBubble, render_frame_host)); |
| +#endif |
| } |
| void ChromeContentBrowserClient::OpenURL( |