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

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

Issue 2761373002: Move yet more from WmShell to Shell (Closed)
Patch Set: merge Created 3 years, 9 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/app_list.cc ('k') | ash/shell/window_type_launcher.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 a5183b504d9e4aea6b31dfafb8f2e229fff9b66e..b61ace578a911b741cbeaf7587a17849109beef6 100644
--- a/ash/shell/content/client/shell_browser_main_parts.cc
+++ b/ash/shell/content/client/shell_browser_main_parts.cc
@@ -137,11 +137,11 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
// creating shelf.
example_session_controller_client_ =
base::MakeUnique<ExampleSessionControllerClient>(
- WmShell::Get()->session_controller());
+ Shell::Get()->session_controller());
example_session_controller_client_->Initialize();
- ash::WmShell::Get()->CreateShelfView();
- ash::WmShell::Get()->UpdateAfterLoginStatusChange(LoginStatus::USER);
+ ash::Shell::Get()->CreateShelfView();
+ ash::Shell::Get()->UpdateAfterLoginStatusChange(LoginStatus::USER);
window_watcher_.reset(new ash::shell::WindowWatcher);
display::Screen::GetScreen()->AddObserver(window_watcher_.get());
« no previous file with comments | « ash/shell/app_list.cc ('k') | ash/shell/window_type_launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698