| Index: ash/root_window_controller.cc
 | 
| diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
 | 
| index a975fa8ec0c402723103a4d052fbe940096f14fd..6cefecc9f69ab93cd462f6f80c00c79a6316640e 100644
 | 
| --- a/ash/root_window_controller.cc
 | 
| +++ b/ash/root_window_controller.cc
 | 
| @@ -12,6 +12,7 @@
 | 
|  #include "ash/display/display_controller.h"
 | 
|  #include "ash/display/display_manager.h"
 | 
|  #include "ash/focus_cycler.h"
 | 
| +#include "ash/session_state_delegate.h"
 | 
|  #include "ash/shelf/shelf_layout_manager.h"
 | 
|  #include "ash/shelf/shelf_types.h"
 | 
|  #include "ash/shelf/shelf_widget.h"
 | 
| @@ -290,7 +291,7 @@ void RootWindowController::InitForPrimaryDisplay() {
 | 
|          new ToplevelWindowEventHandler(panel_container));
 | 
|      panel_container->SetLayoutManager(panel_layout_manager_);
 | 
|    }
 | 
| -  if (Shell::GetInstance()->delegate()->IsUserLoggedIn())
 | 
| +  if (Shell::GetInstance()->session_state_delegate()->HasActiveUser())
 | 
|      shelf_->CreateLauncher();
 | 
|  
 | 
|    InitKeyboard();
 | 
| 
 |