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

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 2684793004: [Harmony] Harmonize Bluetooth dialogs. (Closed)
Patch Set: . Created 3 years, 10 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/ui/ash/system_tray_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index e80cd4d85b3dbe8b856c0dc98b3b2da7037f3148..6954545e633fc0f1263ff87fcd609b3f1fbb19ff 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -37,7 +37,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/accessibility/magnification_manager.h"
-#include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h"
+#include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_view.h"
#include "chrome/browser/chromeos/events/system_key_event_listener.h"
#include "chrome/browser/chromeos/input_method/input_method_switch_recorder.h"
#include "chrome/browser/chromeos/input_method/input_method_util.h"
@@ -60,6 +60,7 @@
#include "chrome/browser/ui/chrome_pages.h"
#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
#include "chrome/browser/ui/singleton_tabs.h"
+#include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/features.h"
#include "chrome/common/pref_names.h"
@@ -428,9 +429,11 @@ void SystemTrayDelegateChromeOS::ConnectToBluetoothDevice(
// Show pairing dialog for the unpaired device.
base::RecordAction(
base::UserMetricsAction("StatusArea_Bluetooth_Connect_Unknown"));
- BluetoothPairingDialog* dialog = new BluetoothPairingDialog(device);
// The dialog deletes itself on close.
- dialog->ShowInContainer(SystemTrayClient::GetDialogParentContainerId());
+ BluetoothPairingView::ShowDialog(
+ SystemTrayClient::GetDialogParentContainerId(),
+ ProfileManager::GetActiveUserProfile(), new ChromeWebContentsHandler,
+ device);
}
bool SystemTrayDelegateChromeOS::IsBluetoothDiscovering() const {

Powered by Google App Engine
This is Rietveld 408576698