Open Ash shell after creating Profile

chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.h"
 
+#include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/toolkit_extra_parts.h"
 #include "chrome/browser/ui/ash/ash_init.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/views/ash/tab_scrubber.h"
 #include "chrome/common/chrome_switches.h"
 #include "ui/aura/env.h"
 #include "ui/gfx/screen.h"
@@ skipping 38 matching lines @@
 
 #endif
 
 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() {
 }
 
 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {
 }
 
 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
+  // For OS_CHROMEOS, initialization order needs to be carefully controlled,
+  // so OpenAsh is called from ChromeBrowserMainPartsChromeos.
+#if !defined(OS_CHROMEOS)
   if (chrome::ShouldOpenAshOnStartup()) {
     chrome::OpenAsh();
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kAshDisableTabScrubbing)) {
-      TabScrubber::GetInstance();
-    }
   } else {
-#if !defined(OS_CHROMEOS)
     gfx::Screen::SetScreenTypeDelegate(new ScreenTypeDelegateWin);
     ui::SelectFileDialog::SetShellDialogsDelegate(
         &g_shell_dialogs_delegate.Get());
+  }
 #endif
-  }
 
 #if defined(FILE_MANAGER_EXTENSION)
   ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory);
 #endif
 }
 
 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
+  // Initialize TabScrubber after the Ash Shell has been initialized.
+  if (ash::Shell::HasInstance() &&
+      !CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kAshDisableTabScrubbing)) {
+    TabScrubber::GetInstance();
+  }
 }
 
 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
+  // For OS_CHROMEOS, CloseAsh is called from ChromeBrowserMainPartsChromeos.
+#if !defined(OS_CHROMEOS)
   chrome::CloseAsh();
+#endif
 }
 
 namespace chrome {
 
 void AddAshToolkitExtraParts(ChromeBrowserMainParts* main_parts) {
   main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh());
 }
 
 }  // namespace chrome