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

Unified Diff: chrome/browser/extensions/extension_input_api.cc

Issue 8651001: Move functions out of TOUCH_UI defines. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments Created 9 years, 1 month 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/extensions/extension_input_api.cc
diff --git a/chrome/browser/extensions/extension_input_api.cc b/chrome/browser/extensions/extension_input_api.cc
index a8bfc1554959aa64edb23ac7627324e38f4b0d3d..e71b126d16dce97c2bbe7f33d55a8ebf3a5dc033 100644
--- a/chrome/browser/extensions/extension_input_api.cc
+++ b/chrome/browser/extensions/extension_input_api.cc
@@ -23,7 +23,7 @@
#include "content/public/browser/notification_service.h"
#endif
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+#if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)
#include "chrome/browser/chromeos/input_method/ibus_controller.h"
#include "chrome/browser/chromeos/input_method/input_method_manager.h"
#include "chrome/browser/chromeos/login/base_login_display_host.h"
@@ -74,7 +74,7 @@ uint16 UnicodeIdentifierStringToInt(const std::string& key_identifier) {
}
views::Widget* GetTopLevelWidget(Browser* browser) {
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+#if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)
chromeos::LoginDisplayHost* host =
chromeos::BaseLoginDisplayHost::default_host();
if (host)
@@ -187,7 +187,7 @@ bool SetKeyboardHeightFunction::RunImpl() {
}
#endif
-#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+#if defined(OS_CHROMEOS) && defined(USE_VIRTUAL_KEYBOARD)
// TODO(yusukes): This part should be moved to extension_input_api_chromeos.cc.
bool SendHandwritingStrokeFunction::RunImpl() {
// TODO(yusukes): Add a parameter for an input context ID.

Powered by Google App Engine
This is Rietveld 408576698