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

Unified Diff: ui/views/ime/input_method_ibus.cc

Issue 8656004: Remove more totally obvious usage of: defined(TOUCH_UI) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« no previous file with comments | « ui/views/focus/accelerator_handler.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/ime/input_method_ibus.cc
diff --git a/ui/views/ime/input_method_ibus.cc b/ui/views/ime/input_method_ibus.cc
index f9ffe6c2c78725123924152385bd649ce4606d2b..3f3a6b881a5024d696578207da1adbca3ae36e56 100644
--- a/ui/views/ime/input_method_ibus.cc
+++ b/ui/views/ime/input_method_ibus.cc
@@ -28,7 +28,7 @@
#include "ui/views/events/event.h"
#include "ui/views/widget/widget.h"
-#if defined(USE_AURA) || defined(TOUCH_UI)
+#if defined(USE_AURA)
#include "ui/base/keycodes/keyboard_code_conversion_x.h"
#elif defined(TOOLKIT_USES_GTK)
#include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
@@ -799,7 +799,7 @@ void InputMethodIBus::OnForwardKeyEvent(IBusInputContext* context,
DCHECK_EQ(context_, context);
ui::KeyboardCode key_code = ui::VKEY_UNKNOWN;
-#if defined(USE_AURA) || defined(TOUCH_UI)
+#if defined(USE_AURA)
key_code = ui::KeyboardCodeFromXKeysym(keyval);
#elif defined(TOOLKIT_USES_GTK)
key_code = ui::WindowsKeyCodeForGdkKeyCode(keyval);
« no previous file with comments | « ui/views/focus/accelerator_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698