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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « views/ime/input_method_ibus.cc ('k') | views/widget/native_widget_gtk.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 9
10 'conditions': [ 10 'conditions': [
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 'widget/root_view_drop_target.cc', 424 'widget/root_view_drop_target.cc',
425 'window/hit_test.cc', 425 'window/hit_test.cc',
426 'window/native_frame_view.cc', 426 'window/native_frame_view.cc',
427 ], 427 ],
428 }], 428 }],
429 ['touchui==1', { 429 ['touchui==1', {
430 'defines': ['TOUCH_UI=1'], 430 'defines': ['TOUCH_UI=1'],
431 'sources/': [ 431 'sources/': [
432 ['exclude', 'focus/accelerator_handler_gtk.cc'], 432 ['exclude', 'focus/accelerator_handler_gtk.cc'],
433 ['exclude', 'controls/menu/native_menu_gtk.cc'], 433 ['exclude', 'controls/menu/native_menu_gtk.cc'],
434 ['exclude', 'ime/input_method_gtk.cc'],
435 ['exclude', 'ime/input_method_gtk.h'],
434 ], 436 ],
435 'conditions': [ 437 'conditions': [
436 ['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"!= ""', { 438 ['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"!= ""', {
437 # Exclude TouchFactory if XInput2 is not available. 439 # Exclude TouchFactory if XInput2 is not available.
438 'sources/': [ 440 'sources/': [
439 ['exclude', 'touchui/touch_factory.cc'], 441 ['exclude', 'touchui/touch_factory.cc'],
440 ['exclude', 'touchui/touch_factory.h'], 442 ['exclude', 'touchui/touch_factory.h'],
441 ], 443 ],
442 }], 444 }],
443 ['use_ibus==1', {
444 'dependencies': [
445 '../build/linux/system.gyp:ibus',
446 ],
447 'sources/': [
448 ['exclude', 'ime/input_method_gtk.cc'],
449 ['exclude', 'ime/input_method_gtk.h'],
450 ],
451 }, { # else: use_ibus != 1
452 'sources/': [
453 ['exclude', 'ime/input_method_ibus.cc'],
454 ['exclude', 'ime/input_method_ibus.h'],
455 ],
456 }],
457 ], 445 ],
458 }, { # else: touchui != 1 446 }],
459 'sources!': [ 447 ['use_ibus==1', {
460 'ime/input_method_ibus.cc', 448 'dependencies': [
461 'ime/input_method_ibus.h', 449 '../build/linux/system.gyp:ibus',
450 ],
451 }, { # else: use_ibus != 1
452 'sources/': [
453 ['exclude', 'ime/input_method_ibus.cc'],
454 ['exclude', 'ime/input_method_ibus.h'],
462 ], 455 ],
463 }], 456 }],
464 ['OS=="win"', { 457 ['OS=="win"', {
465 'include_dirs': [ 458 'include_dirs': [
466 '<(DEPTH)/third_party/wtl/include', 459 '<(DEPTH)/third_party/wtl/include',
467 ], 460 ],
468 }], 461 }],
469 ], 462 ],
470 }, 463 },
471 { 464 {
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 ], 628 ],
636 }, 629 },
637 ], 630 ],
638 } 631 }
639 632
640 # Local Variables: 633 # Local Variables:
641 # tab-width:2 634 # tab-width:2
642 # indent-tabs-mode:nil 635 # indent-tabs-mode:nil
643 # End: 636 # End:
644 # vim: set expandtab tabstop=2 shiftwidth=2: 637 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« 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