diff options
| author | bshe <bshe@chromium.org> | 2015-04-08 11:21:29 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-08 18:22:13 +0000 |
| commit | a0a5780fdc75676746d9e754424834a1812357eb (patch) | |
| tree | c9e982b8ca1bdb362c5df1513fdde293b1940fee /ash/root_window_controller.cc | |
| parent | 161c75ec3841127c2299b4b7961d0b3fc7c4e51c (diff) | |
| download | chromium_src-a0a5780fdc75676746d9e754424834a1812357eb.zip chromium_src-a0a5780fdc75676746d9e754424834a1812357eb.tar.gz chromium_src-a0a5780fdc75676746d9e754424834a1812357eb.tar.bz2 | |
Allow javascript change the virtual keyboard window size and position freely in FLOATING mode
This CL includes the following changes:
1. The virtual keyboard container window is no longer automatically set to full screen size.
Instead, it will be set to the same size as the virtual keyboard window and will be positioned
where that window was positioned. This is to allow window.moveTo to move the VK window
correctly.
2. VK window and VK container is no longer always full width. In FLOATING mode,
window.resizeTo can resize the VK window to specified size.
3. Added one test for FLOATING mode and other tests fixes
BUG=466702
Review URL: https://codereview.chromium.org/1008453002
Cr-Commit-Position: refs/heads/master@{#324253}
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index 1a56f5e..3bb279b 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -44,7 +44,6 @@ #include "ash/wm/status_area_layout_manager.h" #include "ash/wm/system_background_controller.h" #include "ash/wm/system_modal_container_layout_manager.h" -#include "ash/wm/virtual_keyboard_container_layout_manager.h" #include "ash/wm/window_properties.h" #include "ash/wm/window_state.h" #include "ash/wm/window_util.h" @@ -635,9 +634,6 @@ void RootWindowController::ActivateKeyboard( keyboard_controller->GetContainerWindow(); keyboard_container->set_id(kShellWindowId_VirtualKeyboardContainer); parent->AddChild(keyboard_container); - // TODO(oshima): Bounds of keyboard container should be handled by - // RootWindowLayoutManager. Remove this after fixed RootWindowLayoutManager. - keyboard_container->SetBounds(parent->bounds()); } void RootWindowController::DeactivateKeyboard( @@ -993,9 +989,6 @@ void RootWindowController::CreateContainersInRootWindow( lock_screen_related_containers); wm::SetSnapsChildrenToPhysicalPixelBoundary( virtual_keyboard_parent_container); - virtual_keyboard_parent_container->SetLayoutManager( - new VirtualKeyboardContainerLayoutManager( - virtual_keyboard_parent_container)); SetUsesScreenCoordinates(virtual_keyboard_parent_container); aura::Window* menu_container = CreateContainer( |