Index: athena/main/athena_main.cc |
diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc |
index 6ac6efc6fd013b384a08bf48a9a20ef721942fa1..aaef9305493042a41ee384b64c2adc5079ab323a 100644 |
--- a/athena/main/athena_main.cc |
+++ b/athena/main/athena_main.cc |
@@ -14,6 +14,8 @@ |
#include "athena/main/athena_launcher.h" |
#include "athena/main/placeholder.h" |
#include "athena/main/url_search_provider.h" |
+#include "athena/virtual_keyboard/public/virtual_keyboard_bindings.h" |
+#include "athena/virtual_keyboard/public/virtual_keyboard_manager.h" |
#include "base/command_line.h" |
#include "base/file_util.h" |
#include "content/public/app/content_main.h" |
@@ -41,12 +43,15 @@ class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate { |
extension_system->LoadApp(app_absolute_dir); |
} |
- athena::StartAthena( |
- apps::ShellDesktopController::instance()->host()->window(), |
- new athena::ContentActivityFactory(), |
- new athena::ContentAppModelBuilder(context)); |
+ aura::Window* root = |
+ apps::ShellDesktopController::instance()->host()->window(); |
+ athena::StartAthena(root, |
+ new athena::ContentActivityFactory(), |
+ new athena::ContentAppModelBuilder(context)); |
athena::HomeCard::Get()->RegisterSearchProvider( |
new athena::UrlSearchProvider(context)); |
+ athena::VirtualKeyboardManager::Create(root, context); |
+ |
CreateTestPages(context); |
} |
@@ -73,7 +78,9 @@ class AthenaRendererMainDelegate : public apps::ShellRendererMainDelegate { |
// apps::ShellRendererMainDelegate: |
virtual void OnThreadStarted(content::RenderThread* thread) OVERRIDE {} |
- virtual void OnViewCreated(content::RenderView* render_view) OVERRIDE {} |
+ virtual void OnViewCreated(content::RenderView* render_view) OVERRIDE { |
+ athena::VirtualKeyboardBindings::Create(render_view); |
+ } |
DISALLOW_COPY_AND_ASSIGN(AthenaRendererMainDelegate); |
}; |