| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| index 816a71f5949ece6dc1ee3f57f1610fbfcde1b14a..50996df58c369a7a29996eacf4a44153c78c9779 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -718,22 +718,22 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
|
| detector->Enable(true);
|
| }
|
|
|
| - display_configuration_observer_.reset(
|
| - new DisplayConfigurationObserver());
|
| -
|
| automatic_reboot_manager_.reset(new system::AutomaticRebootManager(
|
| scoped_ptr<base::TickClock>(new base::DefaultTickClock)));
|
|
|
| - // This observer cannot be created earlier because it requires the shell to be
|
| - // available.
|
| - idle_action_warning_observer_.reset(new IdleActionWarningObserver());
|
| -
|
| ChromeBrowserMainPartsLinux::PostProfileInit();
|
| }
|
|
|
| void ChromeBrowserMainPartsChromeos::PreBrowserStart() {
|
| // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
|
| // -- just before MetricsService::LogNeedForCleanShutdown().
|
| + // -- Called after ChromeBrowserMainExtraPartsAsh::PostProfileInit() which
|
| + // creates the Ash Shell.
|
| +
|
| + // These observers cannot be created earlier because they require the Ash
|
| + // Shell to be available.
|
| + display_configuration_observer_.reset(new DisplayConfigurationObserver());
|
| + idle_action_warning_observer_.reset(new IdleActionWarningObserver());
|
|
|
| g_browser_process->metrics_service()->StartExternalMetrics();
|
|
|
|
|