Call OpenAsh before Profile Init and CreateLauncher() after

This partially undoes the changes from
https://chromiumcodereview.appspot.com/15702004

Rather than initializing Ash after Profile Init, initialize Ash first
and postpone CreateLauncher() and any other calls that may depend on
GetDefaultProfile() until after profiles have been initialized.

BUG=245055

Review URL: https://chromiumcodereview.appspot.com/16229008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203454 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 18 insertions, 16 deletions

diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc
index f2f206f..5d54da1 100644
--- a/ash/shelf/shelf_widget.cc
+++ b/ash/shelf/shelf_widget.cc
@@ -497,25 +497,28 @@ bool ShelfWidget::GetDimsShelf() const {
 }
 
 void ShelfWidget::CreateLauncher() {
-  if (!launcher_) {
-    Shell* shell = Shell::GetInstance();
-    // This needs to be called before launcher_model().
-    shell->GetLauncherDelegate();
-    launcher_.reset(new Launcher(shell->launcher_model(),
-                                 shell->GetLauncherDelegate(),
-                                 this));
+  if (launcher_)
+    return;
 
-    SetFocusCycler(shell->focus_cycler());
+  Shell* shell = Shell::GetInstance();
+  // This needs to be called before launcher_model().
+  LauncherDelegate* launcher_delegate = shell->GetLauncherDelegate();
+  if (!launcher_delegate)
+    return;  // Not ready to create Launcher
 
-    // Inform the root window controller.
-    internal::RootWindowController::ForWindow(window_container_)->
-        OnLauncherCreated();
+  launcher_.reset(new Launcher(shell->launcher_model(),
+                               shell->GetLauncherDelegate(),
+                               this));
+  SetFocusCycler(shell->focus_cycler());
 
-    launcher_->SetVisible(
-        shell->session_state_delegate()->IsActiveUserSessionStarted());
+  // Inform the root window controller.
+  internal::RootWindowController::ForWindow(window_container_)->
+      OnLauncherCreated();
 
-    Show();
-  }
+  launcher_->SetVisible(
+      shell->session_state_delegate()->IsActiveUserSessionStarted());
+
+  Show();
 }
 
 bool ShelfWidget::IsLauncherVisible() const {
@@ -579,4 +582,3 @@ void ShelfWidget::DisableDimmingAnimationsForTest() {
 }
 
 }  // namespace ash
-