Chromium Code Reviews| Index: chrome/browser/android/usb/web_usb_chooser_service_android.h |
| diff --git a/chrome/browser/usb/web_usb_chooser_service.h b/chrome/browser/android/usb/web_usb_chooser_service_android.h |
| similarity index 63% |
| copy from chrome/browser/usb/web_usb_chooser_service.h |
| copy to chrome/browser/android/usb/web_usb_chooser_service_android.h |
| index e0cffe526697ee3e674cfc60ca51fd14468a881c..19d72f8ba5dd081997b4b82823c69fe07701f503 100644 |
| --- a/chrome/browser/usb/web_usb_chooser_service.h |
| +++ b/chrome/browser/android/usb/web_usb_chooser_service_android.h |
| @@ -2,34 +2,33 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#ifndef CHROME_BROWSER_USB_WEB_USB_CHOOSER_SERVICE_H_ |
| -#define CHROME_BROWSER_USB_WEB_USB_CHOOSER_SERVICE_H_ |
| +#ifndef CHROME_BROWSER_ANDROID_USB_WEB_USB_CHOOSER_SERVICE_ANDROID_H_ |
| +#define CHROME_BROWSER_ANDROID_USB_WEB_USB_CHOOSER_SERVICE_ANDROID_H_ |
| #include <vector> |
| #include "base/macros.h" |
| -#include "components/bubble/bubble_reference.h" |
| +#include "base/memory/scoped_ptr.h" |
| #include "device/usb/public/interfaces/chooser_service.mojom.h" |
| #include "mojo/public/cpp/bindings/array.h" |
| #include "mojo/public/cpp/bindings/binding_set.h" |
| #include "mojo/public/cpp/bindings/interface_request.h" |
| +class UsbChooserAndroid; |
| + |
| namespace content { |
| class RenderFrameHost; |
| } |
| -namespace device { |
| -class UsbDevice; |
| -} |
| - |
| // Implementation of the public device::usb::ChooserService interface. |
| // This interface can be used by a webpage to request permission from user |
| // to access a certain device. |
| -class WebUsbChooserService : public device::usb::ChooserService { |
| +class WebUsbChooserServiceAndroid : public device::usb::ChooserService { |
| public: |
| - explicit WebUsbChooserService(content::RenderFrameHost* render_frame_host); |
| + explicit WebUsbChooserServiceAndroid( |
| + content::RenderFrameHost* render_frame_host); |
| - ~WebUsbChooserService() override; |
| + ~WebUsbChooserServiceAndroid() override; |
| // device::usb::ChooserService: |
| void GetPermission(mojo::Array<device::usb::DeviceFilterPtr> device_filters, |
| @@ -40,9 +39,9 @@ class WebUsbChooserService : public device::usb::ChooserService { |
| private: |
| content::RenderFrameHost* const render_frame_host_; |
| mojo::BindingSet<device::usb::ChooserService> bindings_; |
| - std::vector<BubbleReference> bubbles_; |
| + std::vector<scoped_ptr<UsbChooserAndroid>> usb_chooser_android_; |
|
Yaron
2016/03/07 21:51:49
Does it really make sense to have multiple of thes
juncai
2016/03/09 01:26:51
By having multiple of these, it can support multip
|
| - DISALLOW_COPY_AND_ASSIGN(WebUsbChooserService); |
| + DISALLOW_COPY_AND_ASSIGN(WebUsbChooserServiceAndroid); |
| }; |
| -#endif // CHROME_BROWSER_USB_WEB_USB_CHOOSER_SERVICE_H_ |
| +#endif // CHROME_BROWSER_ANDROID_USB_WEB_USB_CHOOSER_SERVICE_ANDROID_H_ |