Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Unified Diff: ash/shell/content/client/shell_browser_main_parts.cc

Issue 2393083005: Moves Shell::CreateShelf() to WmShell (Closed)
Patch Set: fix shell Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/shell.cc ('k') | ash/test/test_session_state_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « ash/shell.cc ('k') | ash/test/test_session_state_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698