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

Side by Side Diff: ui/ui.gyp

Issue 8576005: IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix RHWVA and ui::InputMethodBase Created 9 years 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 'includes': [ 9 'includes': [
10 'ui_resources.gypi', 10 'ui_resources.gypi',
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 'base/gtk/owned_widget_gtk.cc', 124 'base/gtk/owned_widget_gtk.cc',
125 'base/gtk/owned_widget_gtk.h', 125 'base/gtk/owned_widget_gtk.h',
126 'base/gtk/tooltip_window_gtk.cc', 126 'base/gtk/tooltip_window_gtk.cc',
127 'base/gtk/tooltip_window_gtk.h', 127 'base/gtk/tooltip_window_gtk.h',
128 'base/hit_test.h', 128 'base/hit_test.h',
129 'base/ime/character_composer.cc', 129 'base/ime/character_composer.cc',
130 'base/ime/character_composer.h', 130 'base/ime/character_composer.h',
131 'base/ime/composition_text.cc', 131 'base/ime/composition_text.cc',
132 'base/ime/composition_text.h', 132 'base/ime/composition_text.h',
133 'base/ime/composition_underline.h', 133 'base/ime/composition_underline.h',
134 'base/ime/input_method.cc',
135 'base/ime/input_method.h',
136 'base/ime/input_method_base.cc',
137 'base/ime/input_method_base.h',
138 'base/ime/input_method_delegate.h',
139 'base/ime/input_method_ibus.cc',
140 'base/ime/input_method_ibus.h',
141 'base/ime/mock_input_method.cc',
142 'base/ime/mock_input_method.h',
134 'base/ime/text_input_client.cc', 143 'base/ime/text_input_client.cc',
135 'base/ime/text_input_client.h', 144 'base/ime/text_input_client.h',
136 'base/ime/text_input_type.h', 145 'base/ime/text_input_type.h',
137 'base/keycodes/keyboard_code_conversion.cc', 146 'base/keycodes/keyboard_code_conversion.cc',
138 'base/keycodes/keyboard_code_conversion.h', 147 'base/keycodes/keyboard_code_conversion.h',
139 'base/keycodes/keyboard_code_conversion_gtk.cc', 148 'base/keycodes/keyboard_code_conversion_gtk.cc',
140 'base/keycodes/keyboard_code_conversion_gtk.h', 149 'base/keycodes/keyboard_code_conversion_gtk.h',
141 'base/keycodes/keyboard_code_conversion_mac.h', 150 'base/keycodes/keyboard_code_conversion_mac.h',
142 'base/keycodes/keyboard_code_conversion_mac.mm', 151 'base/keycodes/keyboard_code_conversion_mac.mm',
143 'base/keycodes/keyboard_code_conversion_win.cc', 152 'base/keycodes/keyboard_code_conversion_win.cc',
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 ['exclude', 'base/x/active_window_watcher_x.h'], 358 ['exclude', 'base/x/active_window_watcher_x.h'],
350 ['exclude', 'base/x/active_window_watcher_x_observer.h'], 359 ['exclude', 'base/x/active_window_watcher_x_observer.h'],
351 ['exclude', 'base/x/root_window_property_watcher_x.cc'], 360 ['exclude', 'base/x/root_window_property_watcher_x.cc'],
352 ['exclude', 'base/x/root_window_property_watcher_x.h'], 361 ['exclude', 'base/x/root_window_property_watcher_x.h'],
353 ['exclude', 'base/x/work_area_watcher_x.cc'], 362 ['exclude', 'base/x/work_area_watcher_x.cc'],
354 ['exclude', 'base/x/work_area_watcher_x.h'], 363 ['exclude', 'base/x/work_area_watcher_x.h'],
355 ['exclude', 'base/x/work_area_watcher_x_observer.h'], 364 ['exclude', 'base/x/work_area_watcher_x_observer.h'],
356 ], 365 ],
357 }, { # use_aura!=1 366 }, { # use_aura!=1
358 'sources!': [ 367 'sources!': [
368 'base/ime/input_method_ibus.cc',
369 'base/ime/input_method_ibus.h',
370 'base/ime/mock_input_method.cc',
371 'base/ime/mock_input_method.h',
359 'gfx/native_theme_aura.cc', 372 'gfx/native_theme_aura.cc',
360 'gfx/native_theme_aura.h', 373 'gfx/native_theme_aura.h',
361 ] 374 ]
362 }], 375 }],
363 ['use_aura==1 and OS=="win"', { 376 ['use_aura==1 and OS=="win"', {
364 'sources/': [ 377 'sources/': [
365 ['exclude', 'base/dragdrop/os_exchange_data_provider_win.cc'], 378 ['exclude', 'base/dragdrop/os_exchange_data_provider_win.cc'],
366 ['exclude', 'base/dragdrop/os_exchange_data_provider_win.h'], 379 ['exclude', 'base/dragdrop/os_exchange_data_provider_win.h'],
367 ['exclude', 'gfx/native_theme_win.cc'], 380 ['exclude', 'gfx/native_theme_win.cc'],
368 ['exclude', 'gfx/native_theme_win.h'], 381 ['exclude', 'gfx/native_theme_win.h'],
369 ['exclude', 'gfx/path_win.cc'], 382 ['exclude', 'gfx/path_win.cc'],
370 ], 383 ],
371 }], 384 }],
385 ['use_ibus==1', {
386 'dependencies': [
387 '../build/linux/system.gyp:ibus',
388 ],
389 'sources/': [
390 ['exclude', 'base/ime/mock_input_method.cc'],
391 ['exclude', 'base/ime/mock_input_method.h'],
392 ],
393 }, { # else: use_ibus != 1
394 'sources/': [
395 ['exclude', 'base/ime/input_method_ibus.cc'],
396 ['exclude', 'base/ime/input_method_ibus.h'],
397 ],
398 }],
399
372 ['use_glib == 1', { 400 ['use_glib == 1', {
373 'dependencies': [ 401 'dependencies': [
374 # font_gtk.cc uses fontconfig. 402 # font_gtk.cc uses fontconfig.
375 '../build/linux/system.gyp:fontconfig', 403 '../build/linux/system.gyp:fontconfig',
376 '../build/linux/system.gyp:glib', 404 '../build/linux/system.gyp:glib',
377 '../build/linux/system.gyp:pangocairo', 405 '../build/linux/system.gyp:pangocairo',
378 '../build/linux/system.gyp:x11', 406 '../build/linux/system.gyp:x11',
379 '../build/linux/system.gyp:xext', 407 '../build/linux/system.gyp:xext',
380 '../build/linux/system.gyp:xfixes', 408 '../build/linux/system.gyp:xfixes',
381 ], 409 ],
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \ 673 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \
646 'os.chmod(\'<(ui_copy_dest)\', 0700)' 674 'os.chmod(\'<(ui_copy_dest)\', 0700)'
647 ] 675 ]
648 } 676 }
649 ], 677 ],
650 }, 678 },
651 ], 679 ],
652 }], 680 }],
653 ], 681 ],
654 } 682 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698