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

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

Issue 8051010: Separate Virtual Keyboard related conditionals from TouchUI (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased on ToT, fix along with review comments Created 9 years, 2 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 | « build/common.gypi ('k') | chrome/browser/extensions/extension_function_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 bb6f06e4a22bb8489b69358ae15aad056fa58132..f110594bd530afe2047a021c7353f07c4df10a93 100644
--- a/chrome/browser/chromeos/login/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/webui_login_view.cc
@@ -30,7 +30,7 @@
#include "views/widget/native_widget_gtk.h"
#include "views/widget/widget.h"
-#if defined(TOUCH_UI)
+#if defined(USE_VIRTUAL_KEYBOARD)
#include "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h"
#endif
@@ -111,7 +111,7 @@ WebUILoginView::WebUILoginView()
status_window_(NULL),
host_window_frozen_(false),
status_area_visibility_on_init_(true) {
-#if defined(TOUCH_UI)
+#if defined(USE_VIRTUAL_KEYBOARD)
// Make sure the singleton VirtualKeyboardManager object is created.
VirtualKeyboardManager::GetInstance();
#endif
« no previous file with comments | « build/common.gypi ('k') | chrome/browser/extensions/extension_function_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698