Index: ash/root_window_controller.cc |
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc |
index 1e1c5bdaa20937b8e9146734d587308473a3bf39..23feb0e61cb48c12e9bb5a6874217eea0738bacb 100644 |
--- a/ash/root_window_controller.cc |
+++ b/ash/root_window_controller.cc |
@@ -44,7 +44,7 @@ |
#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/virtual_keyboard_container_layout_manager.h" |
sadrul
2015/04/07 17:35:51
Remove
bshe
2015/04/07 18:46:14
dooh..
Done
|
#include "ash/wm/window_properties.h" |
#include "ash/wm/window_state.h" |
#include "ash/wm/window_util.h" |
@@ -635,9 +635,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 +990,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( |