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

Unified Diff: ash/root_window_controller.cc

Issue 2739763003: Moves maintaining ShellObservers back 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/mus/bridge/wm_shell_mus.cc ('k') | ash/shelf/shelf_widget_unittest.cc » ('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 5d666501d9f6090db11795ffab1613d475e0c8ed..c0cc36aba8d8a485ca572f932112f426e4d1fe8f 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -386,7 +386,7 @@ void RootWindowController::CreateShelfView() {
// Notify shell observers that the shelf has been created.
// TODO(jamescook): Move this into WmShelf::InitializeShelf(). This will
// require changing AttachedPanelWidgetTargeter's access to WmShelf.
- WmShell::Get()->NotifyShelfCreatedForRootWindow(
+ Shell::GetInstance()->NotifyShelfCreatedForRootWindow(
WmWindow::Get(GetRootWindow()));
wm_shelf_->shelf_widget()->PostCreateShelf();
@@ -551,7 +551,7 @@ void RootWindowController::OnWallpaperAnimationFinished(views::Widget* widget) {
}
void RootWindowController::Shutdown() {
- WmShell::Get()->RemoveShellObserver(this);
+ Shell::GetInstance()->RemoveShellObserver(this);
touch_exploration_manager_.reset();
@@ -680,7 +680,7 @@ void RootWindowController::ActivateKeyboard(
keyboard_controller->AddObserver(workspace_controller()->layout_manager());
keyboard_controller->AddObserver(
always_on_top_controller_->GetLayoutManager());
- WmShell::Get()->NotifyVirtualKeyboardActivated(true);
+ Shell::GetInstance()->NotifyVirtualKeyboardActivated(true);
aura::Window* parent = GetContainer(kShellWindowId_ImeWindowParentContainer);
DCHECK(parent);
aura::Window* keyboard_container = keyboard_controller->GetContainerWindow();
@@ -711,7 +711,7 @@ void RootWindowController::DeactivateKeyboard(
workspace_controller()->layout_manager());
keyboard_controller->RemoveObserver(
always_on_top_controller_->GetLayoutManager());
- WmShell::Get()->NotifyVirtualKeyboardActivated(false);
+ Shell::GetInstance()->NotifyVirtualKeyboardActivated(false);
}
}
@@ -804,7 +804,7 @@ void RootWindowController::Init(RootWindowType root_window_type) {
GetSystemModalLayoutManager(nullptr)->CreateModalBackground();
}
- wm_shell->AddShellObserver(this);
+ shell->AddShellObserver(this);
root_window_layout_manager_->OnWindowResized();
if (root_window_type == RootWindowType::PRIMARY) {
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.cc ('k') | ash/shelf/shelf_widget_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698