| 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 277cf6782b3765cfc4b58aac54770232a97b8281..b7c1f33b2f67804176ce102fae29d92a893d98a0 100644
|
| --- a/chrome/browser/usb/usb_tab_helper.h
|
| +++ b/chrome/browser/usb/usb_tab_helper.h
|
| @@ -13,14 +13,14 @@
|
| #include "mojo/public/cpp/bindings/interface_request.h"
|
|
|
| namespace device {
|
| +
|
| +class ChooserService;
|
| +
|
| namespace usb {
|
| class DeviceManager;
|
| class PermissionProvider;
|
| }
|
| -}
|
|
|
| -namespace webusb {
|
| -class WebUsbPermissionBubble;
|
| }
|
|
|
| struct FrameUsbServices;
|
| @@ -42,9 +42,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::ChooserService> request);
|
| #endif // !defined(OS_ANDROID)
|
|
|
| private:
|
| @@ -62,9 +62,9 @@ class UsbTabHelper : public content::WebContentsObserver,
|
| mojo::InterfaceRequest<device::usb::PermissionProvider> request);
|
|
|
| #if !defined(OS_ANDROID)
|
| - void GetPermissionBubble(
|
| + void GetChooserService(
|
| content::RenderFrameHost* render_frame_host,
|
| - mojo::InterfaceRequest<webusb::WebUsbPermissionBubble> request);
|
| + mojo::InterfaceRequest<device::ChooserService> request);
|
| #endif // !defined(OS_ANDROID)
|
|
|
| FrameUsbServicesMap frame_usb_services_;
|
|
|