Index: ash/root_window_controller.cc |
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc |
index f216c7ab8c464b71b2ff9676cda7f0688f3be08a..c24b2f6f2206abc57a8d26760911c2065c44f390 100644 |
--- a/ash/root_window_controller.cc |
+++ b/ash/root_window_controller.cc |
@@ -53,6 +53,7 @@ |
#include "ui/views/corewm/visibility_controller.h" |
#include "ui/views/view_model.h" |
#include "ui/views/view_model_utils.h" |
+#include "ui/virtual_keyboard/virtual_keyboard_controller.h" |
namespace ash { |
namespace { |
@@ -173,6 +174,11 @@ RootWindowController::RootWindowController(aura::RootWindow* root_window) |
stacking_controller_.reset(new ash::StackingController); |
aura::client::SetStackingClient(root_window, stacking_controller_.get()); |
+ |
+ virtual_keyboard::VirtualKeyboardControllerProxy* proxy = |
+ Shell::GetInstance()->delegate()->CreateVirtualKeyboardControllerProxy(); |
+ virtual_keyboard_controller_.reset( |
+ new virtual_keyboard::VirtualKeyboardController(proxy)); |
} |
RootWindowController::~RootWindowController() { |
@@ -262,6 +268,13 @@ void RootWindowController::InitLayoutManagers() { |
always_on_top_container->SetLayoutManager( |
new BaseLayoutManager( |
always_on_top_container->GetRootWindow())); |
+ |
+ // FIXME(bryeung): where is the right place for this? |
+ aura::Window* keyboard_container = virtual_keyboard_controller_->Init(); |
+ // FIXME(bryeung): how to keep it full-screen? |
+ root_window()->AddChild(keyboard_container); |
+ // FIXME(bryeung): how to keep it on top? |
+ root_window()->StackChildAtTop(keyboard_container); |
} |
void RootWindowController::InitForPrimaryDisplay() { |