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

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

Issue 572853002: Realigning the WeakPtrFactory initialization order in chrome/ui folder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed mac error Created 6 years, 3 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
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1696b14f8ffc87853098d42969eea291e7ecdad9..4445d3ec1b98f5948f2719f78f87a00660c03fc7 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -185,8 +185,7 @@ void OnAcceptMultiprofilesIntro(bool no_show_again) {
} // namespace
SystemTrayDelegateChromeOS::SystemTrayDelegateChromeOS()
- : weak_ptr_factory_(this),
- user_profile_(NULL),
+ : user_profile_(NULL),
clock_type_(base::GetHourClockType()),
search_key_mapped_to_(input_method::kSearchKey),
screen_locked_(false),
@@ -197,7 +196,8 @@ SystemTrayDelegateChromeOS::SystemTrayDelegateChromeOS()
device_settings_observer_(CrosSettings::Get()->AddSettingsObserver(
kSystemUse24HourClock,
base::Bind(&SystemTrayDelegateChromeOS::UpdateClockType,
- base::Unretained(this)))) {
+ base::Unretained(this)))),
+ weak_ptr_factory_(this) {
// Register notifications on construction so that events such as
// PROFILE_CREATED do not get missed if they happen before Initialize().
registrar_.reset(new content::NotificationRegistrar);
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.h ('k') | chrome/browser/ui/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698