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 62fa372215ae9470f7480e6e8e28188cdf94091d..572b7db90ada37205f281ca55701e2dead2429e8 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -270,6 +270,10 @@ |
#include "chrome/browser/media/router/presentation_service_delegate_impl.h" |
#endif |
+#if !defined(OS_ANDROID) && !defined(OS_IOS) |
+#include "chrome/browser/usb/web_usb_permission_bubble.h" |
+#endif |
+ |
using base::FileDescriptor; |
using blink::WebWindowFeatures; |
using content::AccessTokenStore; |
@@ -640,6 +644,14 @@ 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) { |
+ ChromeWebUsbPermissionBubble::Create(render_frame_host, request.Pass()); |
+} |
+#endif |
+ |
} // namespace |
ChromeContentBrowserClient::ChromeContentBrowserClient() |
@@ -2579,6 +2591,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) |
+ registry->AddService( |
+ base::Bind(&CreateWebUsbPermissionBubble, render_frame_host)); |
+#endif |
} |
void ChromeContentBrowserClient::OpenURL( |