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

Unified Diff: athena/main/athena_main.cc

Issue 335793005: athena: Add support for virtual keyboard. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 6 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 | « athena/main/DEPS ('k') | athena/main/athena_main.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/main/athena_main.cc
diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc
index 6ac6efc6fd013b384a08bf48a9a20ef721942fa1..f8b254ff12c901628fb7a54723ff549265555a2b 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"
@@ -47,6 +49,8 @@ class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {
new athena::ContentAppModelBuilder(context));
athena::HomeCard::Get()->RegisterSearchProvider(
new athena::UrlSearchProvider(context));
+ athena::VirtualKeyboardManager::Create(context);
+
CreateTestPages(context);
}
@@ -73,7 +77,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);
};
« no previous file with comments | « athena/main/DEPS ('k') | athena/main/athena_main.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698