 Chromium Code Reviews
 Chromium Code Reviews Issue 1408193003:
  Add chrome side webusb permission UI code  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master
    
  
    Issue 1408193003:
  Add chrome side webusb permission UI code  (Closed) 
  Base URL: https://chromium.googlesource.com/chromium/src.git@master| 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 c2bb342e7dc12a3e421177c46c3e77fcc0174262..484df9ebddd57f93d775a9bcbdfbcfc5d1011bf7 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*, | 
| 
Reilly Grant (use Gerrit)
2015/11/16 22:45:46
You can now use std::map instead of base::ScopedPt
 
juncai
2015/11/17 03:42:15
Done.
 | 
| + 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); | 
| }; |