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

Unified 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: address sky@'s comments, added TODO to chrome_bubble_manager.cc 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/chrome_bubble_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f9f87bc27a3ea7ad6dd264f07bf07535705bf864..778bd5d2c9271d088a1ca0b288a3a23353088635 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -280,6 +280,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
+
#if defined(ENABLE_WAYLAND_SERVER)
#include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
#endif
@@ -659,6 +663,23 @@ void CreateUsbDeviceManager(
tab_helper->CreateDeviceManager(render_frame_host, request.Pass());
}
+#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 // !defined(OS_ANDROID) && !defined(OS_IOS)
+
} // namespace
ChromeContentBrowserClient::ChromeContentBrowserClient()
@@ -2614,6 +2635,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 // !defined(OS_ANDROID) && !defined(OS_IOS)
}
void ChromeContentBrowserClient::RegisterOutOfProcessMojoApplications(
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/ui/chrome_bubble_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698