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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.h

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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 6 #define CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
7 7
8 #include "ash/ime/input_method_menu_manager.h" 8 #include "ash/ime/input_method_menu_manager.h"
9 #include "ash/session/session_state_observer.h" 9 #include "ash/session/session_state_observer.h"
10 #include "ash/system/tray/system_tray.h" 10 #include "ash/system/tray/system_tray.h"
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 228
229 // Overridden from chrome::BrowserListObserver: 229 // Overridden from chrome::BrowserListObserver:
230 virtual void OnBrowserRemoved(Browser* browser) OVERRIDE; 230 virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
231 231
232 // Overridden from extensions::AppWindowRegistry::Observer: 232 // Overridden from extensions::AppWindowRegistry::Observer:
233 virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) OVERRIDE; 233 virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) OVERRIDE;
234 234
235 void OnAccessibilityStatusChanged( 235 void OnAccessibilityStatusChanged(
236 const AccessibilityStatusEventDetails& details); 236 const AccessibilityStatusEventDetails& details);
237 237
238 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
239 scoped_ptr<content::NotificationRegistrar> registrar_; 238 scoped_ptr<content::NotificationRegistrar> registrar_;
240 scoped_ptr<PrefChangeRegistrar> local_state_registrar_; 239 scoped_ptr<PrefChangeRegistrar> local_state_registrar_;
241 scoped_ptr<PrefChangeRegistrar> user_pref_registrar_; 240 scoped_ptr<PrefChangeRegistrar> user_pref_registrar_;
242 Profile* user_profile_; 241 Profile* user_profile_;
243 base::HourClockType clock_type_; 242 base::HourClockType clock_type_;
244 int search_key_mapped_to_; 243 int search_key_mapped_to_;
245 bool screen_locked_; 244 bool screen_locked_;
246 bool have_session_start_time_; 245 bool have_session_start_time_;
247 base::TimeTicks session_start_time_; 246 base::TimeTicks session_start_time_;
248 bool have_session_length_limit_; 247 bool have_session_length_limit_;
249 base::TimeDelta session_length_limit_; 248 base::TimeDelta session_length_limit_;
250 std::string enterprise_domain_; 249 std::string enterprise_domain_;
251 bool should_run_bluetooth_discovery_; 250 bool should_run_bluetooth_discovery_;
252 251
253 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_; 252 scoped_refptr<device::BluetoothAdapter> bluetooth_adapter_;
254 scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_; 253 scoped_ptr<device::BluetoothDiscoverySession> bluetooth_discovery_session_;
255 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_; 254 scoped_ptr<ash::VolumeControlDelegate> volume_control_delegate_;
256 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_; 255 scoped_ptr<CrosSettingsObserverSubscription> device_settings_observer_;
257 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_; 256 scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_;
258 base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate> 257 base::ScopedPtrHashMap<std::string, ash::tray::UserAccountsDelegate>
259 accounts_delegates_; 258 accounts_delegates_;
260 259
260 base::WeakPtrFactory<SystemTrayDelegateChromeOS> weak_ptr_factory_;
261
261 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS); 262 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegateChromeOS);
262 }; 263 };
263 264
264 ash::SystemTrayDelegate* CreateSystemTrayDelegate(); 265 ash::SystemTrayDelegate* CreateSystemTrayDelegate();
265 266
266 } // namespace chromeos 267 } // namespace chromeos
267 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_ 268 #endif // CHROME_BROWSER_UI_ASH_SYSTEM_TRAY_DELEGATE_CHROMEOS_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/screenshot_taker.cc ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698