| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.h
|
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.h b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
|
| index 7dc069da4a61d344cce94a227aac75a12e13b339..b02c50b77423a9ea0cd084a710ba16b99e638600 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.h
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.h
|
| @@ -16,6 +16,7 @@ class PowerSaveBlocker;
|
|
|
| namespace chromeos {
|
|
|
| +class ChromeNetworkWatcher;
|
| class DataPromoNotification;
|
| class EventRewriter;
|
| class ExtensionSystemEventObserver;
|
| @@ -57,21 +58,29 @@ class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {
|
| virtual void PostDestroyThreads() OVERRIDE;
|
|
|
| private:
|
| + // PostMainMessageLoopStart
|
| + scoped_ptr<internal::DBusServices> dbus_services_;
|
| +
|
| + // PreProfileInit
|
| + scoped_ptr<ChromeNetworkWatcher> chrome_network_watcher_;
|
| scoped_ptr<default_app_order::ExternalLoader> app_order_loader_;
|
| - scoped_ptr<ExtensionSystemEventObserver> extension_system_event_observer_;
|
| - scoped_ptr<PeripheralBatteryObserver> peripheral_battery_observer_;
|
| scoped_ptr<PowerPrefs> power_prefs_;
|
| - scoped_ptr<PowerButtonObserver> power_button_observer_;
|
| +
|
| + // PostProfileInit
|
| + scoped_ptr<ExtensionSystemEventObserver> extension_system_event_observer_;
|
| scoped_ptr<content::PowerSaveBlocker> retail_mode_power_save_blocker_;
|
| + scoped_ptr<PeripheralBatteryObserver> peripheral_battery_observer_;
|
| scoped_ptr<IdleActionWarningObserver> idle_action_warning_observer_;
|
| - scoped_ptr<DataPromoNotification> data_promo_notification_;
|
| -
|
| - scoped_ptr<internal::DBusServices> dbus_services_;
|
|
|
| + // PreBrowserStart
|
| #if defined(USE_X11)
|
| scoped_ptr<EventRewriter> event_rewriter_;
|
| #endif
|
|
|
| + // PostBrowserStart
|
| + scoped_ptr<PowerButtonObserver> power_button_observer_;
|
| + scoped_ptr<DataPromoNotification> data_promo_notification_;
|
| +
|
| VersionLoader cros_version_loader_;
|
| base::CancelableTaskTracker tracker_;
|
| bool use_new_network_change_notifier_;
|
|
|