| 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..83f7c3201fea9864cbab692d03785074035f5fd1 100644
|
| --- a/chrome/browser/usb/usb_tab_helper.h
|
| +++ b/chrome/browser/usb/usb_tab_helper.h
|
| @@ -18,7 +18,14 @@ class PermissionProvider;
|
| }
|
| }
|
|
|
| -class WebUSBPermissionProvider;
|
| +namespace webusb {
|
| +class WebUsbPermissionBubble;
|
| +}
|
| +
|
| +struct FrameUsbServices;
|
| +
|
| +typedef base::ScopedPtrMap<content::RenderFrameHost*,
|
| + scoped_ptr<FrameUsbServices>> FrameUsbServicesMap;
|
|
|
| // Per-tab owner of USB services provided to render frames within that tab.
|
| class UsbTabHelper : public content::WebContentsObserver,
|
| @@ -33,6 +40,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>;
|
| @@ -40,12 +51,18 @@ class UsbTabHelper : public content::WebContentsObserver,
|
| // content::WebContentsObserver overrides:
|
| void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
|
|
|
| + FrameUsbServicesMap::const_iterator GetFrameUsbService(
|
| + content::RenderFrameHost* render_frame_host);
|
| +
|
| void GetPermissionProvider(
|
| 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);
|
| +
|
| + FrameUsbServicesMap frame_usb_services_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(UsbTabHelper);
|
| };
|
|
|