diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-31 19:29:55 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-31 19:29:55 +0000 |
| commit | 8e6986af5167094c71bba75c2659899c8c949f69 (patch) | |
| tree | 219ae75e585471bf533a113297465353b00ec020 /ash/root_window_controller.cc | |
| parent | 9b730732f8dbdb44283e6cebaf7cf39ff53bb07b (diff) | |
| download | chromium_src-8e6986af5167094c71bba75c2659899c8c949f69.zip chromium_src-8e6986af5167094c71bba75c2659899c8c949f69.tar.gz chromium_src-8e6986af5167094c71bba75c2659899c8c949f69.tar.bz2 | |
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
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 0e3b452..78cf208 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -281,6 +281,10 @@ void RootWindowController::InitForPrimaryDisplay() { new ToplevelWindowEventHandler(panel_container)); panel_container->SetLayoutManager(panel_layout_manager_); + // TODO(stevenjb/oshima): Remove this call to CreateLauncher() and call + // ash::Shell::CreateLauncher() explicitly in ash_shell and ash_unittests + // so that the behavior and construction order is consistent betwheen Ash + // and Chrome. if (Shell::GetInstance()->session_state_delegate()->NumberOfLoggedInUsers()) shelf_->CreateLauncher(); |