OLD | NEW |
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/browser/bluetooth/bluetooth_device_chooser_controller.h" |
9 #include "content/public/browser/web_contents.h" | 10 #include "content/public/browser/web_contents.h" |
10 | 11 |
11 ChromeExtensionBluetoothChooser::ChromeExtensionBluetoothChooser( | 12 ChromeExtensionBluetoothChooser::ChromeExtensionBluetoothChooser( |
12 content::RenderFrameHost* frame, | 13 content::RenderFrameHost* frame, |
13 const content::BluetoothChooser::EventHandler& event_handler) { | 14 const content::BluetoothChooser::EventHandler& event_handler) { |
14 std::unique_ptr<BluetoothChooserController> bluetooth_chooser_controller( | 15 std::unique_ptr<BluetoothChooserController> bluetooth_chooser_controller( |
15 new BluetoothChooserController(frame, event_handler)); | 16 new BluetoothChooserController(frame, event_handler)); |
16 // Since ChromeExtensionBluetoothChooser object is destroyed before the | 17 // Since ChromeExtensionBluetoothChooser object is destroyed before the |
17 // view object which owns |bluetooth_chooser_controller_| when the chooser | 18 // 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. | 19 // bubble/dialog closes, it is safe to store and use the raw pointer here. |
(...skipping 16 matching lines...) Expand all Loading... |
35 | 36 |
36 void ChromeExtensionBluetoothChooser::AddOrUpdateDevice( | 37 void ChromeExtensionBluetoothChooser::AddOrUpdateDevice( |
37 const std::string& device_id, | 38 const std::string& device_id, |
38 bool should_update_name, | 39 bool should_update_name, |
39 const base::string16& device_name, | 40 const base::string16& device_name, |
40 bool is_gatt_connected, | 41 bool is_gatt_connected, |
41 bool is_paired, | 42 bool is_paired, |
42 const int8_t* rssi) { | 43 const int8_t* rssi) { |
43 bluetooth_chooser_controller_->AddOrUpdateDevice( | 44 bluetooth_chooser_controller_->AddOrUpdateDevice( |
44 device_id, should_update_name, device_name, is_gatt_connected, is_paired, | 45 device_id, should_update_name, device_name, is_gatt_connected, is_paired, |
45 rssi); | 46 rssi ? content::BluetoothDeviceChooserController:: |
| 47 CalculateSignalStrengthLevel(*rssi) |
| 48 : -1); |
46 } | 49 } |
47 | 50 |
48 void ChromeExtensionBluetoothChooser::RemoveDevice( | 51 void ChromeExtensionBluetoothChooser::RemoveDevice( |
49 const std::string& device_id) { | 52 const std::string& device_id) { |
50 bluetooth_chooser_controller_->RemoveDevice(device_id); | 53 bluetooth_chooser_controller_->RemoveDevice(device_id); |
51 } | 54 } |
OLD | NEW |