OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_DELEGATE_H_ | 5 #ifndef CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_DELEGATE_H_ |
6 #define CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_DELEGATE_H_ | 6 #define CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_DELEGATE_H_ |
7 | 7 |
8 #include <utility> | |
9 | |
8 #include "base/macros.h" | 10 #include "base/macros.h" |
9 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
10 #include "base/memory/weak_ptr.h" | 12 #include "base/memory/weak_ptr.h" |
11 #include "base/scoped_observer.h" | 13 #include "base/scoped_observer.h" |
12 #include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h" | 14 #include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h" |
13 #include "components/bubble/bubble_reference.h" | 15 #include "components/bubble/bubble_reference.h" |
14 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h" | 16 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h" |
15 #include "device/usb/usb_service.h" | 17 #include "device/usb/usb_service.h" |
16 #include "mojo/public/cpp/bindings/array.h" | 18 #include "mojo/public/cpp/bindings/array.h" |
17 | 19 |
(...skipping 13 matching lines...) Expand all Loading... | |
31 public device::UsbService::Observer { | 33 public device::UsbService::Observer { |
32 public: | 34 public: |
33 UsbChooserBubbleDelegate( | 35 UsbChooserBubbleDelegate( |
34 Browser* browser, | 36 Browser* browser, |
35 mojo::Array<device::usb::DeviceFilterPtr> device_filters, | 37 mojo::Array<device::usb::DeviceFilterPtr> device_filters, |
36 content::RenderFrameHost* render_frame_host, | 38 content::RenderFrameHost* render_frame_host, |
37 const webusb::WebUsbPermissionBubble::GetPermissionCallback& callback); | 39 const webusb::WebUsbPermissionBubble::GetPermissionCallback& callback); |
38 ~UsbChooserBubbleDelegate() override; | 40 ~UsbChooserBubbleDelegate() override; |
39 | 41 |
40 // ChooserBubbleDelegate: | 42 // ChooserBubbleDelegate: |
41 const std::vector<base::string16>& GetOptions() const override; | 43 size_t NumOptions() const override; |
42 void Select(int index) override; | 44 const base::string16& GetOption(size_t index) const override; |
45 void Select(size_t index) override; | |
43 void Cancel() override; | 46 void Cancel() override; |
44 void Close() override; | 47 void Close() override; |
45 | 48 |
46 // device::UsbService::Observer: | 49 // device::UsbService::Observer: |
47 void OnDeviceAdded(scoped_refptr<device::UsbDevice> device) override; | 50 void OnDeviceAdded(scoped_refptr<device::UsbDevice> device) override; |
48 void OnDeviceRemoved(scoped_refptr<device::UsbDevice> device) override; | 51 void OnDeviceRemoved(scoped_refptr<device::UsbDevice> device) override; |
49 | 52 |
50 void GotUsbDeviceList( | 53 void GotUsbDeviceList( |
51 const std::vector<scoped_refptr<device::UsbDevice>>& devices); | 54 const std::vector<scoped_refptr<device::UsbDevice>>& devices); |
52 | 55 |
53 void set_bubble_controller(BubbleReference bubble_controller); | 56 void set_bubble_controller(BubbleReference bubble_controller); |
54 | 57 |
55 private: | 58 private: |
56 content::RenderFrameHost* const render_frame_host_; | 59 content::RenderFrameHost* const render_frame_host_; |
57 webusb::WebUsbPermissionBubble::GetPermissionCallback callback_; | 60 webusb::WebUsbPermissionBubble::GetPermissionCallback callback_; |
58 ScopedObserver<device::UsbService, device::UsbService::Observer> | 61 ScopedObserver<device::UsbService, device::UsbService::Observer> |
59 usb_service_observer_; | 62 usb_service_observer_; |
60 std::vector<device::UsbDeviceFilter> filters_; | 63 std::vector<device::UsbDeviceFilter> filters_; |
61 std::vector<scoped_refptr<device::UsbDevice>> devices_; | 64 // The vector contains device object and device name pair for the |
62 std::vector<base::string16> devices_names_; | 65 // same device. |
Peter Kasting
2016/01/04 21:02:52
Nit: How about:
Each pair is a (device, device na
juncai
2016/01/04 22:44:47
Done.
| |
66 std::vector<std::pair<scoped_refptr<device::UsbDevice>, base::string16>> | |
67 devices_; | |
63 BubbleReference bubble_controller_; | 68 BubbleReference bubble_controller_; |
64 base::WeakPtrFactory<UsbChooserBubbleDelegate> weak_factory_; | 69 base::WeakPtrFactory<UsbChooserBubbleDelegate> weak_factory_; |
65 | 70 |
66 DISALLOW_COPY_AND_ASSIGN(UsbChooserBubbleDelegate); | 71 DISALLOW_COPY_AND_ASSIGN(UsbChooserBubbleDelegate); |
67 }; | 72 }; |
68 | 73 |
69 #endif // CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_DELEGATE_H_ | 74 #endif // CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_DELEGATE_H_ |
OLD | NEW |