Index: chrome/browser/usb/usb_tab_helper.h |
diff --git a/chrome/browser/usb/usb_tab_helper.h b/chrome/browser/usb/usb_tab_helper.h |
index d4cc97da01ce2cc5ef53ecf60a5ee907559afc78..cd102abd5ab56676e1451ed43288ce1bf31f644c 100644 |
--- a/chrome/browser/usb/usb_tab_helper.h |
+++ b/chrome/browser/usb/usb_tab_helper.h |
@@ -18,7 +18,11 @@ class PermissionProvider; |
} |
} |
-class WebUSBPermissionProvider; |
+namespace webusb { |
+class WebUsbPermissionBubble; |
+} |
+ |
+struct FrameUsbServices; |
// Per-tab owner of USB services provided to render frames within that tab. |
class UsbTabHelper : public content::WebContentsObserver, |
@@ -33,6 +37,10 @@ class UsbTabHelper : public content::WebContentsObserver, |
content::RenderFrameHost* render_frame_host, |
mojo::InterfaceRequest<device::usb::DeviceManager> request); |
+ void CreatePermissionBubble( |
+ content::RenderFrameHost* render_frame_host, |
+ mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request); |
+ |
private: |
explicit UsbTabHelper(content::WebContents* web_contents); |
friend class content::WebContentsUserData<UsbTabHelper>; |
@@ -44,8 +52,12 @@ class UsbTabHelper : public content::WebContentsObserver, |
content::RenderFrameHost* render_frame_host, |
mojo::InterfaceRequest<device::usb::PermissionProvider> request); |
- base::ScopedPtrMap<content::RenderFrameHost*, |
- scoped_ptr<WebUSBPermissionProvider>> permission_provider_; |
+ void GetPermissionBubble( |
+ content::RenderFrameHost* render_frame_host, |
+ mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request); |
+ |
+ base::ScopedPtrMap<content::RenderFrameHost*, scoped_ptr<FrameUsbServices>> |
+ frame_usb_services_; |
DISALLOW_COPY_AND_ASSIGN(UsbTabHelper); |
}; |