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

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: move to ash/ime/ Created 8 years, 12 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 | « ui/base/keycodes/keyboard_code_conversion.cc ('k') | ui/views/test/views_test_base.h » ('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 'includes': [ 9 'includes': [
10 'ui_resources.gypi', 10 'ui_resources.gypi',
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 'base/hit_test.h', 133 'base/hit_test.h',
134 'base/ime/character_composer.cc', 134 'base/ime/character_composer.cc',
135 'base/ime/character_composer.h', 135 'base/ime/character_composer.h',
136 'base/ime/composition_text.cc', 136 'base/ime/composition_text.cc',
137 'base/ime/composition_text.h', 137 'base/ime/composition_text.h',
138 'base/ime/composition_underline.h', 138 'base/ime/composition_underline.h',
139 'base/ime/input_method.h', 139 'base/ime/input_method.h',
140 'base/ime/input_method_base.cc', 140 'base/ime/input_method_base.cc',
141 'base/ime/input_method_base.h', 141 'base/ime/input_method_base.h',
142 'base/ime/input_method_delegate.h', 142 'base/ime/input_method_delegate.h',
143 'base/ime/input_method_factory.cc',
144 'base/ime/input_method_factory.h',
143 'base/ime/input_method_ibus.cc', 145 'base/ime/input_method_ibus.cc',
144 'base/ime/input_method_ibus.h', 146 'base/ime/input_method_ibus.h',
145 'base/ime/mock_input_method.cc', 147 'base/ime/mock_input_method.cc',
146 'base/ime/mock_input_method.h', 148 'base/ime/mock_input_method.h',
147 'base/ime/text_input_client.cc', 149 'base/ime/text_input_client.cc',
148 'base/ime/text_input_client.h', 150 'base/ime/text_input_client.h',
149 'base/ime/text_input_type.h', 151 'base/ime/text_input_type.h',
150 'base/javascript_message_type.h', 152 'base/javascript_message_type.h',
151 'base/keycodes/keyboard_code_conversion.cc', 153 'base/keycodes/keyboard_code_conversion.cc',
152 'base/keycodes/keyboard_code_conversion.h', 154 'base/keycodes/keyboard_code_conversion.h',
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 ['exclude', 'base/x/active_window_watcher_x.h'], 366 ['exclude', 'base/x/active_window_watcher_x.h'],
365 ['exclude', 'base/x/active_window_watcher_x_observer.h'], 367 ['exclude', 'base/x/active_window_watcher_x_observer.h'],
366 ['exclude', 'base/x/root_window_property_watcher_x.cc'], 368 ['exclude', 'base/x/root_window_property_watcher_x.cc'],
367 ['exclude', 'base/x/root_window_property_watcher_x.h'], 369 ['exclude', 'base/x/root_window_property_watcher_x.h'],
368 ['exclude', 'base/x/work_area_watcher_x.cc'], 370 ['exclude', 'base/x/work_area_watcher_x.cc'],
369 ['exclude', 'base/x/work_area_watcher_x.h'], 371 ['exclude', 'base/x/work_area_watcher_x.h'],
370 ['exclude', 'base/x/work_area_watcher_x_observer.h'], 372 ['exclude', 'base/x/work_area_watcher_x_observer.h'],
371 ], 373 ],
372 }, { # use_aura!=1 374 }, { # use_aura!=1
373 'sources!': [ 375 'sources!': [
376 'base/ime/input_method_factory.cc',
377 'base/ime/input_method_factory.h',
374 'base/ime/input_method_ibus.cc', 378 'base/ime/input_method_ibus.cc',
375 'base/ime/input_method_ibus.h', 379 'base/ime/input_method_ibus.h',
376 'base/ime/mock_input_method.cc', 380 'base/ime/mock_input_method.cc',
377 'base/ime/mock_input_method.h', 381 'base/ime/mock_input_method.h',
378 'gfx/native_theme_aura.cc', 382 'gfx/native_theme_aura.cc',
379 'gfx/native_theme_aura.h', 383 'gfx/native_theme_aura.h',
380 ] 384 ]
381 }], 385 }],
382 ['use_aura==1 and OS=="win"', { 386 ['use_aura==1 and OS=="win"', {
383 'sources/': [ 387 'sources/': [
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
681 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \ 685 'shutil.copyfile(\'<(ui_copy_target)\', \'<(ui_copy_dest)\'); ' \
682 'os.chmod(\'<(ui_copy_dest)\', 0700)' 686 'os.chmod(\'<(ui_copy_dest)\', 0700)'
683 ] 687 ]
684 } 688 }
685 ], 689 ],
686 }, 690 },
687 ], 691 ],
688 }], 692 }],
689 ], 693 ],
690 } 694 }
OLDNEW
« no previous file with comments | « ui/base/keycodes/keyboard_code_conversion.cc ('k') | ui/views/test/views_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698