Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(125)

Side by Side Diff: chrome/browser/usb/usb_chooser_controller.h

Issue 2615353002: Typemap device.usb.DeviceFilter to device::UsbDeviceFilter. (Closed)
Patch Set: Addressed juncai@'s feedback. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/usb/usb_browsertest.cc ('k') | chrome/browser/usb/usb_chooser_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_USB_USB_CHOOSER_CONTROLLER_H_
6 #define CHROME_BROWSER_USB_USB_CHOOSER_CONTROLLER_H_ 6 #define CHROME_BROWSER_USB_USB_CHOOSER_CONTROLLER_H_
7 7
8 #include <unordered_map> 8 #include <unordered_map>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/scoped_observer.h" 15 #include "base/scoped_observer.h"
16 #include "chrome/browser/chooser_controller/chooser_controller.h" 16 #include "chrome/browser/chooser_controller/chooser_controller.h"
17 #include "device/usb/public/interfaces/chooser_service.mojom.h" 17 #include "device/usb/public/interfaces/chooser_service.mojom.h"
18 #include "device/usb/usb_service.h" 18 #include "device/usb/usb_service.h"
19 19
20 namespace content { 20 namespace content {
21 class RenderFrameHost; 21 class RenderFrameHost;
22 } 22 }
23 23
24 namespace device { 24 namespace device {
25 class UsbDevice; 25 class UsbDevice;
26 class UsbDeviceFilter; 26 struct UsbDeviceFilter;
27 } 27 }
28 28
29 // UsbChooserController creates a chooser for WebUSB. 29 // UsbChooserController creates a chooser for WebUSB.
30 // It is owned by ChooserBubbleDelegate. 30 // It is owned by ChooserBubbleDelegate.
31 class UsbChooserController : public ChooserController, 31 class UsbChooserController : public ChooserController,
32 public device::UsbService::Observer { 32 public device::UsbService::Observer {
33 public: 33 public:
34 UsbChooserController( 34 UsbChooserController(
35 content::RenderFrameHost* render_frame_host, 35 content::RenderFrameHost* render_frame_host,
36 const std::vector<device::usb::DeviceFilterPtr>& device_filters, 36 const std::vector<device::UsbDeviceFilter>& device_filters,
37 const device::usb::ChooserService::GetPermissionCallback& callback); 37 const device::usb::ChooserService::GetPermissionCallback& callback);
38 ~UsbChooserController() override; 38 ~UsbChooserController() override;
39 39
40 // ChooserController: 40 // ChooserController:
41 base::string16 GetNoOptionsText() const override; 41 base::string16 GetNoOptionsText() const override;
42 base::string16 GetOkButtonLabel() const override; 42 base::string16 GetOkButtonLabel() const override;
43 size_t NumOptions() const override; 43 size_t NumOptions() const override;
44 base::string16 GetOption(size_t index) const override; 44 base::string16 GetOption(size_t index) const override;
45 bool IsPaired(size_t index) const override; 45 bool IsPaired(size_t index) const override;
46 void RefreshOptions() override; 46 void RefreshOptions() override;
(...skipping 21 matching lines...) Expand all
68 std::vector<std::pair<scoped_refptr<device::UsbDevice>, base::string16>> 68 std::vector<std::pair<scoped_refptr<device::UsbDevice>, base::string16>>
69 devices_; 69 devices_;
70 // Maps from device name to number of devices. 70 // Maps from device name to number of devices.
71 std::unordered_map<base::string16, int> device_name_map_; 71 std::unordered_map<base::string16, int> device_name_map_;
72 base::WeakPtrFactory<UsbChooserController> weak_factory_; 72 base::WeakPtrFactory<UsbChooserController> weak_factory_;
73 73
74 DISALLOW_COPY_AND_ASSIGN(UsbChooserController); 74 DISALLOW_COPY_AND_ASSIGN(UsbChooserController);
75 }; 75 };
76 76
77 #endif // CHROME_BROWSER_USB_USB_CHOOSER_CONTROLLER_H_ 77 #endif // CHROME_BROWSER_USB_USB_CHOOSER_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/usb/usb_browsertest.cc ('k') | chrome/browser/usb/usb_chooser_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698