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

Unified Diff: ash/root_window_controller.cc

Issue 503383002: Allow component IME extension use app.window and add 'ime' window type for app window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase and make app.window.canSetVisibleOnAllWorkspaces complex feature Created 6 years, 3 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 | « no previous file | ash/shell_unittest.cc » ('j') | extensions/common/api/_api_features.json » ('J')
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 f22800413ca166496320e33cc9950047e7db0f0b..dceddb859e6cffc812a931c2aeeccfac1afd2905 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -648,8 +648,7 @@ void RootWindowController::ActivateKeyboard(
keyboard_controller->AddObserver(docked_layout_manager_);
keyboard_controller->AddObserver(workspace_controller_->layout_manager());
Shell::GetInstance()->delegate()->VirtualKeyboardActivated(true);
- aura::Window* parent = GetContainer(
- kShellWindowId_VirtualKeyboardParentContainer);
+ aura::Window* parent = GetContainer(kShellWindowId_ImeWindowParentContainer);
DCHECK(parent);
aura::Window* keyboard_container =
keyboard_controller->GetContainerWindow();
@@ -669,8 +668,8 @@ void RootWindowController::DeactivateKeyboard(
aura::Window* keyboard_container =
keyboard_controller->GetContainerWindow();
if (keyboard_container->GetRootWindow() == GetRootWindow()) {
- aura::Window* parent = GetContainer(
- kShellWindowId_VirtualKeyboardParentContainer);
+ aura::Window* parent =
+ GetContainer(kShellWindowId_ImeWindowParentContainer);
DCHECK(parent);
parent->RemoveChild(keyboard_container);
// Virtual keyboard may be deactivated while still showing, notify all
@@ -686,8 +685,7 @@ void RootWindowController::DeactivateKeyboard(
}
bool RootWindowController::IsVirtualKeyboardWindow(aura::Window* window) {
- aura::Window* parent = GetContainer(
- kShellWindowId_VirtualKeyboardParentContainer);
+ aura::Window* parent = GetContainer(kShellWindowId_ImeWindowParentContainer);
return parent ? parent->Contains(window) : false;
}
@@ -720,8 +718,8 @@ void RootWindowController::Init(RootWindowType root_window_type,
CreateContainersInRootWindow(root_window);
if (root_window_type == VIRTUAL_KEYBOARD) {
- aura::Window* virtual_keyboard_parent_container = GetContainer(
- kShellWindowId_VirtualKeyboardParentContainer);
+ aura::Window* virtual_keyboard_parent_container =
+ GetContainer(kShellWindowId_ImeWindowParentContainer);
virtual_keyboard_parent_container->SetBounds(root_window->bounds());
shell->InitKeyboard();
return;
@@ -1017,7 +1015,7 @@ void RootWindowController::CreateContainersInRootWindow(
DescendantShouldStayInSameRootWindow(settings_bubble_container);
aura::Window* virtual_keyboard_parent_container =
- CreateContainer(kShellWindowId_VirtualKeyboardParentContainer,
+ CreateContainer(kShellWindowId_ImeWindowParentContainer,
"VirtualKeyboardParentContainer",
lock_screen_related_containers);
wm::SetSnapsChildrenToPhysicalPixelBoundary(
« no previous file with comments | « no previous file | ash/shell_unittest.cc » ('j') | extensions/common/api/_api_features.json » ('J')

Powered by Google App Engine
This is Rietveld 408576698