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

Side by Side Diff: chrome/browser/ui/bluetooth/chrome_extension_bluetooth_chooser.cc

Issue 2155743002: Add throbber and status text to WebBluetooth chooser UI on non-Mac desktops (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed unnecessary include file 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #include "chrome/browser/ui/bluetooth/chrome_extension_bluetooth_chooser.h" 5 #include "chrome/browser/ui/bluetooth/chrome_extension_bluetooth_chooser.h"
6 6
7 #include "chrome/browser/extensions/chrome_extension_chooser_dialog.h" 7 #include "chrome/browser/extensions/chrome_extension_chooser_dialog.h"
8 #include "chrome/browser/ui/bluetooth/bluetooth_chooser_controller.h" 8 #include "chrome/browser/ui/bluetooth/bluetooth_chooser_controller.h"
9 #include "content/public/browser/web_contents.h" 9 #include "content/public/browser/web_contents.h"
10 10
11 ChromeExtensionBluetoothChooser::ChromeExtensionBluetoothChooser( 11 ChromeExtensionBluetoothChooser::ChromeExtensionBluetoothChooser(
12 content::RenderFrameHost* frame, 12 content::RenderFrameHost* frame,
13 const content::BluetoothChooser::EventHandler& event_handler) { 13 const content::BluetoothChooser::EventHandler& event_handler) {
14 std::unique_ptr<BluetoothChooserController> bluetooth_chooser_controller( 14 std::unique_ptr<BluetoothChooserController> bluetooth_chooser_controller(
15 new BluetoothChooserController(frame, event_handler)); 15 new BluetoothChooserController(frame, event_handler));
16 // Since ChromeExtensionBluetoothChooser object is destroyed before the 16 // Since ChromeExtensionBluetoothChooser object is destroyed before the
17 // view object which owns |bluetooth_chooser_controller_| when the chooser 17 // view object which owns |bluetooth_chooser_controller_| when the chooser
18 // bubble/dialog closes, it is safe to store and use the raw pointer here. 18 // bubble/dialog closes, it is safe to store and use the raw pointer here.
19 bluetooth_chooser_controller_ = bluetooth_chooser_controller.get(); 19 bluetooth_chooser_controller_ = bluetooth_chooser_controller.get();
20 chooser_dialog_.reset(new ChromeExtensionChooserDialog( 20 chooser_dialog_.reset(new ChromeExtensionChooserDialog(
21 content::WebContents::FromRenderFrameHost(frame))); 21 content::WebContents::FromRenderFrameHost(frame)));
22 chooser_dialog_->ShowDialog(std::move(bluetooth_chooser_controller)); 22 chooser_dialog_->ShowDialog(std::move(bluetooth_chooser_controller));
23 } 23 }
24 24
25 ChromeExtensionBluetoothChooser::~ChromeExtensionBluetoothChooser() {} 25 ChromeExtensionBluetoothChooser::~ChromeExtensionBluetoothChooser() {}
26 26
27 void ChromeExtensionBluetoothChooser::SetAdapterPresence( 27 void ChromeExtensionBluetoothChooser::SetAdapterPresence(
28 AdapterPresence presence) {} 28 AdapterPresence presence) {
29 bluetooth_chooser_controller_->OnAdapterPresenceChanged(presence);
30 }
29 31
30 void ChromeExtensionBluetoothChooser::ShowDiscoveryState(DiscoveryState state) { 32 void ChromeExtensionBluetoothChooser::ShowDiscoveryState(DiscoveryState state) {
33 bluetooth_chooser_controller_->OnDiscoveryStateChanged(state);
31 } 34 }
32 35
33 void ChromeExtensionBluetoothChooser::AddDevice( 36 void ChromeExtensionBluetoothChooser::AddDevice(
34 const std::string& device_id, 37 const std::string& device_id,
35 const base::string16& device_name) { 38 const base::string16& device_name) {
36 bluetooth_chooser_controller_->AddDevice(device_id, device_name); 39 bluetooth_chooser_controller_->AddDevice(device_id, device_name);
37 } 40 }
38 41
39 void ChromeExtensionBluetoothChooser::RemoveDevice( 42 void ChromeExtensionBluetoothChooser::RemoveDevice(
40 const std::string& device_id) { 43 const std::string& device_id) {
41 bluetooth_chooser_controller_->RemoveDevice(device_id); 44 bluetooth_chooser_controller_->RemoveDevice(device_id);
42 } 45 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/bluetooth/bluetooth_chooser_desktop.cc ('k') | chrome/browser/ui/cocoa/chooser_content_view_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698