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

Unified Diff: ash/root_window_controller.cc

Issue 1008453002: Allow javascript change the virtual keyboard window size and position freely in FLOATING mode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: format Created 5 years, 8 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/ash.gyp ('k') | ash/root_window_controller_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 1a56f5ecaa6e0f2603ee6ef2a073dbdae1150a14..3bb279bc99378032aa3df200a482d5835921921c 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(
« no previous file with comments | « ash/ash.gyp ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698