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

Unified Diff: views/views.gyp

Issue 7004029: Fix to make InputMethodIBus usable on every ChromeOS device (even without TouchUI) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Small fix to replace "if" with "?" Created 9 years, 7 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 | « views/ime/input_method_ibus.cc ('k') | views/widget/native_widget_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/views.gyp
diff --git a/views/views.gyp b/views/views.gyp
index 8f86b11ce932bb910eda27f9c3a5d6c0bc0d6e72..694b5a36243140b963705b71e9c282bfaaad5c7e 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -431,6 +431,8 @@
'sources/': [
['exclude', 'focus/accelerator_handler_gtk.cc'],
['exclude', 'controls/menu/native_menu_gtk.cc'],
+ ['exclude', 'ime/input_method_gtk.cc'],
+ ['exclude', 'ime/input_method_gtk.h'],
],
'conditions': [
['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"!=""', {
@@ -440,25 +442,16 @@
['exclude', 'touchui/touch_factory.h'],
],
}],
- ['use_ibus==1', {
- 'dependencies': [
- '../build/linux/system.gyp:ibus',
- ],
- 'sources/': [
- ['exclude', 'ime/input_method_gtk.cc'],
- ['exclude', 'ime/input_method_gtk.h'],
- ],
- }, { # else: use_ibus != 1
- 'sources/': [
- ['exclude', 'ime/input_method_ibus.cc'],
- ['exclude', 'ime/input_method_ibus.h'],
- ],
- }],
],
- }, { # else: touchui != 1
- 'sources!': [
- 'ime/input_method_ibus.cc',
- 'ime/input_method_ibus.h',
+ }],
+ ['use_ibus==1', {
+ 'dependencies': [
+ '../build/linux/system.gyp:ibus',
+ ],
+ }, { # else: use_ibus != 1
+ 'sources/': [
+ ['exclude', 'ime/input_method_ibus.cc'],
+ ['exclude', 'ime/input_method_ibus.h'],
],
}],
['OS=="win"', {
« no previous file with comments | « views/ime/input_method_ibus.cc ('k') | views/widget/native_widget_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698