| Index: ash/shell.cc
|
| diff --git a/ash/shell.cc b/ash/shell.cc
|
| index d4587091598c1b1e5296a78d0c88776b44dd62e9..396e79c858270f1b93ee88b5e56ad0e6cd728f45 100644
|
| --- a/ash/shell.cc
|
| +++ b/ash/shell.cc
|
| @@ -275,7 +275,7 @@ void Shell::OnLoginStateChanged(LoginStatus status) {
|
| }
|
|
|
| void Shell::OnLoginUserProfilePrepared() {
|
| - CreateShelf();
|
| + wm_shell_->CreateShelf();
|
| CreateKeyboard();
|
| }
|
|
|
| @@ -318,18 +318,6 @@ void Shell::OnRootWindowAdded(WmWindow* root_window) {
|
| OnRootWindowAdded(root_window));
|
| }
|
|
|
| -void Shell::CreateShelf() {
|
| - // Must occur after SessionStateDelegate creation and user login.
|
| - DCHECK(session_state_delegate_);
|
| - DCHECK_GT(session_state_delegate_->NumberOfLoggedInUsers(), 0);
|
| - wm_shell_->CreateShelfDelegate();
|
| -
|
| - RootWindowControllerList controllers = GetAllRootWindowControllers();
|
| - for (RootWindowControllerList::iterator iter = controllers.begin();
|
| - iter != controllers.end(); ++iter)
|
| - (*iter)->CreateShelf();
|
| -}
|
| -
|
| void Shell::CreateKeyboard() {
|
| // TODO(bshe): Primary root window controller may not be the controller to
|
| // attach virtual keyboard. See http://crbug.com/303429
|
|
|