| Index: ash/shell/content/client/shell_browser_main_parts.cc
|
| diff --git a/ash/shell/content/client/shell_browser_main_parts.cc b/ash/shell/content/client/shell_browser_main_parts.cc
|
| index bd20dc4907f231c621a525edd1a2d4640d40d3ad..de9433236a6b5c5e9f117d6c7d83028c59cda01d 100644
|
| --- a/ash/shell/content/client/shell_browser_main_parts.cc
|
| +++ b/ash/shell/content/client/shell_browser_main_parts.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "ash/common/login_status.h"
|
| #include "ash/common/material_design/material_design_controller.h"
|
| +#include "ash/common/wm_shell.h"
|
| #include "ash/content/shell_content_state.h"
|
| #include "ash/shell.h"
|
| #include "ash/shell/content/shell_content_state_impl.h"
|
| @@ -136,7 +137,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
|
| init_params.context_factory = content::GetContextFactory();
|
| init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
|
| ash::Shell::CreateInstance(init_params);
|
| - ash::Shell::GetInstance()->CreateShelf();
|
| + ash::WmShell::Get()->CreateShelf();
|
| ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(LoginStatus::USER);
|
|
|
| window_watcher_.reset(new ash::shell::WindowWatcher);
|
|
|