Add chrome side webusb permission UI code

chrome/browser/usb/usb_tab_helper.cc

Index: chrome/browser/usb/usb_tab_helper.cc
diff --git a/chrome/browser/usb/usb_tab_helper.cc b/chrome/browser/usb/usb_tab_helper.cc
index 152dd0dae5032a48bb0066d0e5945bb3ec4f35c5..ce913a828ddbfac9c44297f159460fd0bebd1ee3 100644
--- a/chrome/browser/usb/usb_tab_helper.cc
+++ b/chrome/browser/usb/usb_tab_helper.cc
@@ -4,6 +4,8 @@
 
 #include "chrome/browser/usb/usb_tab_helper.h"
 
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/usb/web_usb_permission_bubble.h"
 #include "chrome/browser/usb/web_usb_permission_provider.h"
 #include "device/devices_app/usb/device_manager_impl.h"
 
@@ -12,6 +14,11 @@ using content::WebContents;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(UsbTabHelper);
 
+struct FrameUsbServices {
+  scoped_ptr<WebUSBPermissionProvider> permission_provider;
+  scoped_ptr<ChromeWebUsbPermissionBubble> permission_bubble;
+};
+
 // static
 UsbTabHelper* UsbTabHelper::GetOrCreateForWebContents(
     WebContents* web_contents) {
@@ -36,23 +43,49 @@ void UsbTabHelper::CreateDeviceManager(
                                          request.Pass());
 }
 
+void UsbTabHelper::CreatePermissionBubble(
+    content::RenderFrameHost* render_frame_host,
+    mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) {
+  GetPermissionBubble(render_frame_host, request.Pass());
+}
+
 UsbTabHelper::UsbTabHelper(WebContents* web_contents)
     : content::WebContentsObserver(web_contents) {}
 
 void UsbTabHelper::RenderFrameDeleted(RenderFrameHost* render_frame_host) {
-  permission_provider_.erase(render_frame_host);
+  frame_usb_services_.erase(render_frame_host);
+}
+
+FrameUsbServicesMap::const_iterator UsbTabHelper::GetFrameUsbService(
+    content::RenderFrameHost* render_frame_host) {
+  FrameUsbServicesMap::const_iterator it =
+      frame_usb_services_.find(render_frame_host);
+  if (it == frame_usb_services_.end()) {
+    scoped_ptr<FrameUsbServices> frame_usb_services(new FrameUsbServices());
+    it = (frame_usb_services_.insert(render_frame_host,
+                                     frame_usb_services.Pass()))
+             .first;
+  }
+  return it;
 }
 
 void UsbTabHelper::GetPermissionProvider(
     RenderFrameHost* render_frame_host,
     mojo::InterfaceRequest<device::usb::PermissionProvider> request) {
-  const auto it = permission_provider_.find(render_frame_host);
-  if (it == permission_provider_.end()) {
-    scoped_ptr<WebUSBPermissionProvider> permission_provider(
+  const auto it = GetFrameUsbService(render_frame_host);
+  if (!it->second->permission_provider) {
+    it->second->permission_provider.reset(
         new WebUSBPermissionProvider(render_frame_host));
-    permission_provider->Bind(request.Pass());
-    permission_provider_.set(render_frame_host, permission_provider.Pass());
-  } else {
-    it->second->Bind(request.Pass());
+  }
+  it->second->permission_provider->Bind(request.Pass());
+}
+
+void UsbTabHelper::GetPermissionBubble(
+    content::RenderFrameHost* render_frame_host,
+    mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request) {
+  const auto it = GetFrameUsbService(render_frame_host);
+  if (!it->second->permission_bubble) {

[Reilly Grant (use Gerrit), 2015/11/12 21:44:37]

This is just going to drop the interface request on the floor if the page calls
requestDevice() again. ChromeWebUsbPermissionBubble (if it supports handling
more than one bubble) should have a Bind() method like WebUSBPermissionProvider.

[juncai, 2015/11/14 01:54:36]

Done.

+    it->second->permission_bubble.reset(
+        new ChromeWebUsbPermissionBubble(render_frame_host, request.Pass()));
   }
 }