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

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: rebase, review 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 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 'target_defaults': { 9 'target_defaults': {
10 'conditions': [ 10 'conditions': [
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 'base/gtk/owned_widget_gtk.cc', 123 'base/gtk/owned_widget_gtk.cc',
124 'base/gtk/owned_widget_gtk.h', 124 'base/gtk/owned_widget_gtk.h',
125 'base/gtk/tooltip_window_gtk.cc', 125 'base/gtk/tooltip_window_gtk.cc',
126 'base/gtk/tooltip_window_gtk.h', 126 'base/gtk/tooltip_window_gtk.h',
127 'base/hit_test.h', 127 'base/hit_test.h',
128 'base/ime/character_composer.cc', 128 'base/ime/character_composer.cc',
129 'base/ime/character_composer.h', 129 'base/ime/character_composer.h',
130 'base/ime/composition_text.cc', 130 'base/ime/composition_text.cc',
131 'base/ime/composition_text.h', 131 'base/ime/composition_text.h',
132 'base/ime/composition_underline.h', 132 'base/ime/composition_underline.h',
133 'base/ime/input_method.cc',
134 'base/ime/input_method.h',
135 'base/ime/input_method_base.cc',
136 'base/ime/input_method_base.h',
137 'base/ime/input_method_delegate.h',
138 'base/ime/input_method_ibus.cc',
139 'base/ime/input_method_ibus.h',
140 'base/ime/input_method_ibus_aura.cc',
141 'base/ime/input_method_ibus_aura.h',
142 'base/ime/mock_input_method.cc',
143 'base/ime/mock_input_method.h',
133 'base/ime/text_input_client.cc', 144 'base/ime/text_input_client.cc',
134 'base/ime/text_input_client.h', 145 'base/ime/text_input_client.h',
135 'base/ime/text_input_type.h', 146 'base/ime/text_input_type.h',
136 'base/keycodes/keyboard_code_conversion.cc', 147 'base/keycodes/keyboard_code_conversion.cc',
137 'base/keycodes/keyboard_code_conversion.h', 148 'base/keycodes/keyboard_code_conversion.h',
138 'base/keycodes/keyboard_code_conversion_gtk.cc', 149 'base/keycodes/keyboard_code_conversion_gtk.cc',
139 'base/keycodes/keyboard_code_conversion_gtk.h', 150 'base/keycodes/keyboard_code_conversion_gtk.h',
140 'base/keycodes/keyboard_code_conversion_mac.h', 151 'base/keycodes/keyboard_code_conversion_mac.h',
141 'base/keycodes/keyboard_code_conversion_mac.mm', 152 'base/keycodes/keyboard_code_conversion_mac.mm',
142 'base/keycodes/keyboard_code_conversion_win.cc', 153 'base/keycodes/keyboard_code_conversion_win.cc',
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 ['exclude', 'gfx/screen_win.cc'], 352 ['exclude', 'gfx/screen_win.cc'],
342 ['exclude', 'base/view_prop.cc'], 353 ['exclude', 'base/view_prop.cc'],
343 ['exclude', 'base/view_prop.h'], 354 ['exclude', 'base/view_prop.h'],
344 ['exclude', 'base/win/mouse_wheel_util.cc'], 355 ['exclude', 'base/win/mouse_wheel_util.cc'],
345 ['exclude', 'base/win/mouse_wheel_util.h'], 356 ['exclude', 'base/win/mouse_wheel_util.h'],
346 ['exclude', 'base/x/active_window_watcher_x.cc'], 357 ['exclude', 'base/x/active_window_watcher_x.cc'],
347 ['exclude', 'base/x/active_window_watcher_x.h'], 358 ['exclude', 'base/x/active_window_watcher_x.h'],
348 ], 359 ],
349 }, { # use_aura!=1 360 }, { # use_aura!=1
350 'sources!': [ 361 'sources!': [
362 'base/ime/input_method_ibus.cc',
363 'base/ime/input_method_ibus.h',
364 'base/ime/input_method_ibus_aura.cc',
365 'base/ime/input_method_ibus_aura.h',
366 'base/ime/mock_input_method.cc',
367 'base/ime/mock_input_method.h',
351 'gfx/native_theme_aura.cc', 368 'gfx/native_theme_aura.cc',
352 'gfx/native_theme_aura.h', 369 'gfx/native_theme_aura.h',
353 ] 370 ]
354 }], 371 }],
355 ['use_aura==1 and OS=="win"', { 372 ['use_aura==1 and OS=="win"', {
356 'sources/': [ 373 'sources/': [
357 ['exclude', 'base/dragdrop/os_exchange_data_provider_aura.cc'], 374 ['exclude', 'base/dragdrop/os_exchange_data_provider_aura.cc'],
358 ['exclude', 'gfx/native_theme_win.cc'], 375 ['exclude', 'gfx/native_theme_win.cc'],
359 ['exclude', 'gfx/native_theme_win.h'], 376 ['exclude', 'gfx/native_theme_win.h'],
360 ['exclude', 'gfx/path_win.cc'], 377 ['exclude', 'gfx/path_win.cc'],
361 ], 378 ],
362 }], 379 }],
380 ['use_ibus==1', {
381 'dependencies': [
382 '../build/linux/system.gyp:ibus',
383 ],
384 'sources/': [
385 ['exclude', 'base/ime/mock_input_method.cc'],
386 ['exclude', 'base/ime/mock_input_method.h'],
387 ],
388 }, { # else: use_ibus != 1
389 'sources/': [
390 ['exclude', 'base/ime/input_method_ibus.cc'],
391 ['exclude', 'base/ime/input_method_ibus.h'],
392 ],
393 }],
394
363 ['use_glib == 1', { 395 ['use_glib == 1', {
364 'dependencies': [ 396 'dependencies': [
365 # font_gtk.cc uses fontconfig. 397 # font_gtk.cc uses fontconfig.
366 '../build/linux/system.gyp:fontconfig', 398 '../build/linux/system.gyp:fontconfig',
367 '../build/linux/system.gyp:glib', 399 '../build/linux/system.gyp:glib',
368 '../build/linux/system.gyp:pangocairo', 400 '../build/linux/system.gyp:pangocairo',
369 '../build/linux/system.gyp:x11', 401 '../build/linux/system.gyp:x11',
370 '../build/linux/system.gyp:xext', 402 '../build/linux/system.gyp:xext',
371 '../build/linux/system.gyp:xfixes', 403 '../build/linux/system.gyp:xfixes',
372 ], 404 ],
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \ 672 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \
641 'os.chmod(\'<(ui_copy_dest)\', 0700)' 673 'os.chmod(\'<(ui_copy_dest)\', 0700)'
642 ] 674 ]
643 } 675 }
644 ], 676 ],
645 }, 677 },
646 ], 678 ],
647 }], 679 }],
648 ], 680 ],
649 } 681 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698