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

Unified Diff: chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.cc

Issue 2754143006: cros: Convert SystemTrayDelegate::ManageBluetoothDevices to mojo for mash (Closed)
Patch Set: rebase Created 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.cc
diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.cc b/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.cc
index 65c2d9dd29c7631ff172a931452f85baa40d6e80..89c3880b7922656e583df94ae16d35851eb11ecd 100644
--- a/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.cc
+++ b/chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.cc
@@ -16,7 +16,6 @@
#include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
#include "chrome/common/url_constants.h"
#include "chrome/grit/generated_resources.h"
-#include "device/bluetooth/bluetooth_device.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/public/interfaces/window_manager.mojom.h"
#include "ui/base/l10n/l10n_util.h"
@@ -41,12 +40,15 @@ const int kDefaultHeight = 280;
// BluetoothPairingDialog, public:
BluetoothPairingDialog::BluetoothPairingDialog(
- const device::BluetoothDevice* device)
+ const std::string& address,
+ const base::string16& name_for_display,
+ bool paired,
+ bool connected)
: webui_(nullptr) {
- device_data_.SetString("address", device->GetAddress());
- device_data_.SetString("name", device->GetNameForDisplay());
- device_data_.SetBoolean("paired", device->IsPaired());
- device_data_.SetBoolean("connected", device->IsConnected());
+ device_data_.SetString("address", address);
+ device_data_.SetString("name", name_for_display);
+ device_data_.SetBoolean("paired", paired);
+ device_data_.SetBoolean("connected", connected);
}
BluetoothPairingDialog::~BluetoothPairingDialog() {
« no previous file with comments | « chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h ('k') | chrome/browser/ui/ash/system_tray_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698