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

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

Issue 2127203002: Change WebBluetooth chooser OK button's label to be "Pair" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@support_chrome_extension_chooser_title
Patch Set: rebase Created 4 years, 5 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_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>
(...skipping 22 matching lines...) Expand all
33 public device::UsbService::Observer { 33 public device::UsbService::Observer {
34 public: 34 public:
35 UsbChooserController( 35 UsbChooserController(
36 content::RenderFrameHost* owner, 36 content::RenderFrameHost* owner,
37 mojo::Array<device::usb::DeviceFilterPtr> device_filters, 37 mojo::Array<device::usb::DeviceFilterPtr> device_filters,
38 content::RenderFrameHost* render_frame_host, 38 content::RenderFrameHost* render_frame_host,
39 const device::usb::ChooserService::GetPermissionCallback& callback); 39 const device::usb::ChooserService::GetPermissionCallback& callback);
40 ~UsbChooserController() override; 40 ~UsbChooserController() override;
41 41
42 // ChooserController: 42 // ChooserController:
43 base::string16 GetOkButtonLabel() const override;
43 size_t NumOptions() const override; 44 size_t NumOptions() const override;
44 base::string16 GetOption(size_t index) const override; 45 base::string16 GetOption(size_t index) const override;
45 void Select(size_t index) override; 46 void Select(size_t index) override;
46 void Cancel() override; 47 void Cancel() override;
47 void Close() override; 48 void Close() override;
48 void OpenHelpCenterUrl() const override; 49 void OpenHelpCenterUrl() const override;
49 50
50 // device::UsbService::Observer: 51 // device::UsbService::Observer:
51 void OnDeviceAdded(scoped_refptr<device::UsbDevice> device) override; 52 void OnDeviceAdded(scoped_refptr<device::UsbDevice> device) override;
52 void OnDeviceRemoved(scoped_refptr<device::UsbDevice> device) override; 53 void OnDeviceRemoved(scoped_refptr<device::UsbDevice> device) override;
(...skipping 12 matching lines...) Expand all
65 std::vector<std::pair<scoped_refptr<device::UsbDevice>, base::string16>> 66 std::vector<std::pair<scoped_refptr<device::UsbDevice>, base::string16>>
66 devices_; 67 devices_;
67 // Maps from device name to number of devices. 68 // Maps from device name to number of devices.
68 std::unordered_map<base::string16, int> device_name_map_; 69 std::unordered_map<base::string16, int> device_name_map_;
69 base::WeakPtrFactory<UsbChooserController> weak_factory_; 70 base::WeakPtrFactory<UsbChooserController> weak_factory_;
70 71
71 DISALLOW_COPY_AND_ASSIGN(UsbChooserController); 72 DISALLOW_COPY_AND_ASSIGN(UsbChooserController);
72 }; 73 };
73 74
74 #endif // CHROME_BROWSER_USB_USB_CHOOSER_CONTROLLER_H_ 75 #endif // CHROME_BROWSER_USB_USB_CHOOSER_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/chooser_content_view.cc ('k') | chrome/browser/usb/usb_chooser_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698