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

Unified Diff: ash/root_window_controller.cc

Issue 2237903003: mash: Migrate Shelf aura::Window uses to WmWindow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move shelf notify functions to WmShell. Created 4 years, 4 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/common/wm_shell.cc ('k') | ash/shelf/shelf.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 386b4f2f63797a761e7e5c73a633b1f0463961de..cdd41c0f2952bf362c3f37670697977972e9d4cd 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -481,7 +481,7 @@ void RootWindowController::CreateShelf() {
}
// Notify shell observers that the shelf has been created.
- Shell::GetInstance()->OnShelfCreatedForRootWindow(
+ WmShell::Get()->NotifyShelfCreatedForRootWindow(
WmWindowAura::Get(GetRootWindow()));
shelf_widget_->PostCreateShelf();
@@ -675,7 +675,7 @@ void RootWindowController::ActivateKeyboard(
keyboard_controller->AddObserver(workspace_controller_->layout_manager());
keyboard_controller->AddObserver(
always_on_top_controller_->GetLayoutManager());
- WmShell::Get()->OnVirtualKeyboardActivated(true);
+ WmShell::Get()->NotifyVirtualKeyboardActivated(true);
aura::Window* parent = GetContainer(kShellWindowId_ImeWindowParentContainer);
DCHECK(parent);
aura::Window* keyboard_container = keyboard_controller->GetContainerWindow();
@@ -705,7 +705,7 @@ void RootWindowController::DeactivateKeyboard(
workspace_controller_->layout_manager());
keyboard_controller->RemoveObserver(
always_on_top_controller_->GetLayoutManager());
- WmShell::Get()->OnVirtualKeyboardActivated(false);
+ WmShell::Get()->NotifyVirtualKeyboardActivated(false);
}
}
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/shelf/shelf.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698