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

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

Issue 1724183005: Change ChooserBubbleDelegate class name to ChooserBubbleController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merged changes from master, resolved conflicts and updated related files Created 4 years, 9 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
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_BUBBLE_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_CONTROLLER_H_
6 #define CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_DELEGATE_H_ 6 #define CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_CONTROLLER_H_
7 7
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/ref_counted.h" 11 #include "base/memory/ref_counted.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "base/scoped_observer.h" 13 #include "base/scoped_observer.h"
14 #include "chrome/browser/ui/website_settings/chooser_bubble_delegate.h" 14 #include "chrome/browser/ui/website_settings/chooser_bubble_controller.h"
15 #include "components/bubble/bubble_reference.h" 15 #include "components/bubble/bubble_reference.h"
16 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h" 16 #include "components/webusb/public/interfaces/webusb_permission_bubble.mojom.h"
17 #include "device/usb/usb_service.h" 17 #include "device/usb/usb_service.h"
18 #include "mojo/public/cpp/bindings/array.h" 18 #include "mojo/public/cpp/bindings/array.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 class UsbDeviceFilter;
27 } 27 }
28 28
29 // UsbChooserBubbleDelegate creates a chooser bubble for WebUsb. 29 // UsbChooserBubbleController creates a chooser bubble for WebUsb.
30 class UsbChooserBubbleDelegate : public ChooserBubbleDelegate, 30 class UsbChooserBubbleController : public ChooserBubbleController,
31 public device::UsbService::Observer { 31 public device::UsbService::Observer {
32 public: 32 public:
33 UsbChooserBubbleDelegate( 33 UsbChooserBubbleController(
34 content::RenderFrameHost* owner, 34 content::RenderFrameHost* owner,
35 mojo::Array<device::usb::DeviceFilterPtr> device_filters, 35 mojo::Array<device::usb::DeviceFilterPtr> device_filters,
36 content::RenderFrameHost* render_frame_host, 36 content::RenderFrameHost* render_frame_host,
37 const webusb::WebUsbPermissionBubble::GetPermissionCallback& callback); 37 const webusb::WebUsbPermissionBubble::GetPermissionCallback& callback);
38 ~UsbChooserBubbleDelegate() override; 38 ~UsbChooserBubbleController() override;
39 39
40 // ChooserBubbleDelegate: 40 // ChooserBubbleController:
41 size_t NumOptions() const override; 41 size_t NumOptions() const override;
42 const base::string16& GetOption(size_t index) const override; 42 const base::string16& GetOption(size_t index) const override;
43 void Select(size_t index) override; 43 void Select(size_t index) override;
44 void Cancel() override; 44 void Cancel() override;
45 void Close() override; 45 void Close() override;
46 GURL GetHelpCenterUrl() const override; 46 GURL GetHelpCenterUrl() const override;
47 47
48 // device::UsbService::Observer: 48 // device::UsbService::Observer:
49 void OnDeviceAdded(scoped_refptr<device::UsbDevice> device) override; 49 void OnDeviceAdded(scoped_refptr<device::UsbDevice> device) override;
50 void OnDeviceRemoved(scoped_refptr<device::UsbDevice> device) override; 50 void OnDeviceRemoved(scoped_refptr<device::UsbDevice> device) override;
51 51
52 void GotUsbDeviceList( 52 void GotUsbDeviceList(
53 const std::vector<scoped_refptr<device::UsbDevice>>& devices); 53 const std::vector<scoped_refptr<device::UsbDevice>>& devices);
54 54
55 void set_bubble_controller(BubbleReference bubble_controller); 55 void set_bubble_reference(BubbleReference bubble_reference);
56 56
57 private: 57 private:
58 content::RenderFrameHost* const render_frame_host_; 58 content::RenderFrameHost* const render_frame_host_;
59 webusb::WebUsbPermissionBubble::GetPermissionCallback callback_; 59 webusb::WebUsbPermissionBubble::GetPermissionCallback callback_;
60 ScopedObserver<device::UsbService, device::UsbService::Observer> 60 ScopedObserver<device::UsbService, device::UsbService::Observer>
61 usb_service_observer_; 61 usb_service_observer_;
62 std::vector<device::UsbDeviceFilter> filters_; 62 std::vector<device::UsbDeviceFilter> filters_;
63 // Each pair is a (device, device name). 63 // Each pair is a (device, device name).
64 std::vector<std::pair<scoped_refptr<device::UsbDevice>, base::string16>> 64 std::vector<std::pair<scoped_refptr<device::UsbDevice>, base::string16>>
65 devices_; 65 devices_;
66 BubbleReference bubble_controller_; 66 BubbleReference bubble_reference_;
67 base::WeakPtrFactory<UsbChooserBubbleDelegate> weak_factory_; 67 base::WeakPtrFactory<UsbChooserBubbleController> weak_factory_;
68 68
69 DISALLOW_COPY_AND_ASSIGN(UsbChooserBubbleDelegate); 69 DISALLOW_COPY_AND_ASSIGN(UsbChooserBubbleController);
70 }; 70 };
71 71
72 #endif // CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_DELEGATE_H_ 72 #endif // CHROME_BROWSER_USB_USB_CHOOSER_BUBBLE_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/website_settings/chooser_bubble_delegate.cc ('k') | chrome/browser/usb/usb_chooser_bubble_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698