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

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

Issue 2753313002: cros: Init SystemTrayDelegate earlier to break bluetooth init dependency (Closed)
Patch Set: fix test 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/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 c74b5c960fd665f6038c197466e1c4a7d521cbe6..31ec08e679c77d92ceb02bd97f173183c373348b 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -124,7 +124,7 @@ bool IsSessionInSecondaryLoginScreen() {
} // namespace
SystemTrayDelegateChromeOS::SystemTrayDelegateChromeOS()
- : bluetooth_helper_(base::MakeUnique<TrayBluetoothHelper>(this)),
+ : bluetooth_helper_(base::MakeUnique<TrayBluetoothHelper>()),
networking_config_delegate_(
base::MakeUnique<NetworkingConfigDelegateChromeos>()) {
// Register notifications on construction so that events such as
@@ -162,9 +162,7 @@ void SystemTrayDelegateChromeOS::Initialize() {
bluetooth_helper_->Initialize();
BrowserList::AddObserver(this);
-}
-void SystemTrayDelegateChromeOS::InitializeOnAdapterReady() {
local_state_registrar_.reset(new PrefChangeRegistrar);
local_state_registrar_->Init(g_browser_process->local_state());
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | chrome/browser/ui/ash/tray_bluetooth_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698