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 688f50134a39e42ec7acb701f547bb90f4d43434..1771981b16dd76a1dc8d8cb5374271789997dd82 100644 |
--- a/chrome/browser/usb/usb_tab_helper.h |
+++ b/chrome/browser/usb/usb_tab_helper.h |
@@ -14,15 +14,12 @@ |
namespace device { |
namespace usb { |
+class ChooserService; |
class DeviceManager; |
class PermissionProvider; |
} |
} |
-namespace webusb { |
-class WebUsbPermissionBubble; |
-} |
- |
struct FrameUsbServices; |
typedef std::map<content::RenderFrameHost*, scoped_ptr<FrameUsbServices>> |
@@ -42,9 +39,9 @@ class UsbTabHelper : public content::WebContentsObserver, |
mojo::InterfaceRequest<device::usb::DeviceManager> request); |
#if !defined(OS_ANDROID) |
- void CreatePermissionBubble( |
+ void CreateChooserService( |
content::RenderFrameHost* render_frame_host, |
- mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request); |
+ mojo::InterfaceRequest<device::usb::ChooserService> request); |
#endif // !defined(OS_ANDROID) |
private: |
@@ -61,9 +58,9 @@ class UsbTabHelper : public content::WebContentsObserver, |
content::RenderFrameHost* render_frame_host); |
#if !defined(OS_ANDROID) |
- void GetPermissionBubble( |
+ void GetChooserService( |
content::RenderFrameHost* render_frame_host, |
- mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request); |
+ mojo::InterfaceRequest<device::usb::ChooserService> request); |
#endif // !defined(OS_ANDROID) |
FrameUsbServicesMap frame_usb_services_; |