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

Unified Diff: ash/root_window_controller.cc

Issue 2747543002: ash: Start/stop observing KeyboardController via ShellObserver (Closed)
Patch Set: update LockLayoutManager to use similar logic 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/common/wm/workspace/workspace_layout_manager.cc ('k') | ash/shell.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 87b54b4cbf33f33bf10761afdffb2924e751f28a..7e87c423d480613743dd70715913b777fcafbf9a 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -673,13 +673,8 @@ void RootWindowController::ActivateKeyboard(
return;
}
DCHECK(keyboard_controller);
- keyboard_controller->AddObserver(wm_shelf_->shelf_layout_manager());
- keyboard_controller->AddObserver(panel_layout_manager());
- keyboard_controller->AddObserver(docked_window_layout_manager());
- keyboard_controller->AddObserver(workspace_controller()->layout_manager());
- keyboard_controller->AddObserver(
- always_on_top_controller_->GetLayoutManager());
- Shell::GetInstance()->NotifyVirtualKeyboardActivated(true);
+ Shell::GetInstance()->NotifyVirtualKeyboardActivated(
+ true, WmWindow::Get(GetRootWindow()));
aura::Window* parent = GetContainer(kShellWindowId_ImeWindowParentContainer);
DCHECK(parent);
aura::Window* keyboard_container = keyboard_controller->GetContainerWindow();
@@ -703,14 +698,8 @@ void RootWindowController::DeactivateKeyboard(
keyboard_controller->HideKeyboard(
keyboard::KeyboardController::HIDE_REASON_AUTOMATIC);
parent->RemoveChild(keyboard_container);
- keyboard_controller->RemoveObserver(wm_shelf_->shelf_layout_manager());
- keyboard_controller->RemoveObserver(panel_layout_manager());
- keyboard_controller->RemoveObserver(docked_window_layout_manager());
- keyboard_controller->RemoveObserver(
- workspace_controller()->layout_manager());
- keyboard_controller->RemoveObserver(
- always_on_top_controller_->GetLayoutManager());
- Shell::GetInstance()->NotifyVirtualKeyboardActivated(false);
+ Shell::GetInstance()->NotifyVirtualKeyboardActivated(
+ false, WmWindow::Get(GetRootWindow()));
}
}
« no previous file with comments | « ash/common/wm/workspace/workspace_layout_manager.cc ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698