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

Unified Diff: chrome/browser/chromeos/login/webui_login_view.cc

Issue 7302015: A keyboard widget that manages itself (the animation and all that). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge with trunk Created 9 years, 4 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
Index: chrome/browser/chromeos/login/webui_login_view.cc
diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc
index 86174ea0560489227cdfc5a6074895c003e7261e..ada0eaea551fe6db38fc059a43169192b37de760 100644
--- a/chrome/browser/chromeos/login/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/webui_login_view.cc
@@ -20,6 +20,10 @@
#include "views/widget/native_widget_gtk.h"
#include "views/widget/widget.h"
+#if defined(TOUCH_UI)
+#include "chrome/browser/ui/touch/keyboard/keyboard_manager.h"
+#endif
+
namespace {
const char kViewClassName[] = "browser/chromeos/login/WebUILoginView";
@@ -43,6 +47,10 @@ WebUILoginView::WebUILoginView()
webui_login_(NULL),
status_window_(NULL),
host_window_frozen_(false) {
+#if defined(TOUCH_UI)
+ // Make sure the singleton KeyboardManager object is created.
+ KeyboardManager::GetInstance();
+#endif
accel_map_[views::Accelerator(ui::VKEY_Z, false, true, true)] =
kAccelNameAccessibility;
accel_map_[views::Accelerator(ui::VKEY_E, false, true, true)] =
« no previous file with comments | « chrome/browser/chromeos/login/webui_login_display_host.cc ('k') | chrome/browser/ui/touch/frame/keyboard_container_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698