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

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: 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
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 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 ['exclude', 'controls/menu/native_menu_gtk.cc'], 433 ['exclude', 'controls/menu/native_menu_gtk.cc'],
434 ], 434 ],
435 'conditions': [ 435 'conditions': [
436 ['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"!= ""', { 436 ['"<!@(<(pkg-config) --atleast-version=2.0 inputproto || echo $?)"!= ""', {
437 # Exclude TouchFactory if XInput2 is not available. 437 # Exclude TouchFactory if XInput2 is not available.
438 'sources/': [ 438 'sources/': [
439 ['exclude', 'touchui/touch_factory.cc'], 439 ['exclude', 'touchui/touch_factory.cc'],
440 ['exclude', 'touchui/touch_factory.h'], 440 ['exclude', 'touchui/touch_factory.h'],
441 ], 441 ],
442 }], 442 }],
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 ], 443 ],
458 }, { # else: touchui != 1 444 }],
459 'sources!': [ 445 ['use_ibus==1', {
460 'ime/input_method_ibus.cc', 446 'dependencies': [
461 'ime/input_method_ibus.h', 447 '../build/linux/system.gyp:ibus',
448 ],
449 }, { # else: use_ibus != 1
450 'sources/': [
451 ['exclude', 'ime/input_method_ibus.cc'],
452 ['exclude', 'ime/input_method_ibus.h'],
462 ], 453 ],
463 }], 454 }],
464 ['OS=="win"', { 455 ['OS=="win"', {
465 'include_dirs': [ 456 'include_dirs': [
466 '<(DEPTH)/third_party/wtl/include', 457 '<(DEPTH)/third_party/wtl/include',
467 ], 458 ],
468 }], 459 }],
469 ], 460 ],
470 }, 461 },
471 { 462 {
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
635 ], 626 ],
636 }, 627 },
637 ], 628 ],
638 } 629 }
639 630
640 # Local Variables: 631 # Local Variables:
641 # tab-width:2 632 # tab-width:2
642 # indent-tabs-mode:nil 633 # indent-tabs-mode:nil
643 # End: 634 # End:
644 # vim: set expandtab tabstop=2 shiftwidth=2: 635 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698