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

Side by Side Diff: ui/base/ui_base.gyp

Issue 750353004: Revert of Moves code from chromeos/ime to ui/base/ime/chromeos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
« no previous file with comments | « ui/base/ime/input_method_chromeos_unittest.cc ('k') | ui/base/ui_base_tests.gypi » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 'dragdrop/os_exchange_data_provider_aurax11.h', 187 'dragdrop/os_exchange_data_provider_aurax11.h',
188 'dragdrop/os_exchange_data_provider_mac.h', 188 'dragdrop/os_exchange_data_provider_mac.h',
189 'dragdrop/os_exchange_data_provider_mac.mm', 189 'dragdrop/os_exchange_data_provider_mac.mm',
190 'dragdrop/os_exchange_data_provider_win.cc', 190 'dragdrop/os_exchange_data_provider_win.cc',
191 'dragdrop/os_exchange_data_provider_win.h', 191 'dragdrop/os_exchange_data_provider_win.h',
192 'hit_test.h', 192 'hit_test.h',
193 'ime/candidate_window.cc', 193 'ime/candidate_window.cc',
194 'ime/candidate_window.h', 194 'ime/candidate_window.h',
195 'ime/chromeos/character_composer.cc', 195 'ime/chromeos/character_composer.cc',
196 'ime/chromeos/character_composer.h', 196 'ime/chromeos/character_composer.h',
197 'ime/chromeos/component_extension_ime_manager.cc',
198 'ime/chromeos/component_extension_ime_manager.h',
199 'ime/chromeos/composition_text.cc',
200 'ime/chromeos/composition_text.h',
201 'ime/chromeos/extension_ime_util.cc',
202 'ime/chromeos/extension_ime_util.h',
203 'ime/chromeos/fake_ime_keyboard.cc',
204 'ime/chromeos/fake_ime_keyboard.h',
205 'ime/chromeos/fake_input_method_delegate.cc',
206 'ime/chromeos/fake_input_method_delegate.h',
207 'ime/chromeos/ime_bridge.cc', 197 'ime/chromeos/ime_bridge.cc',
208 'ime/chromeos/ime_bridge.h', 198 'ime/chromeos/ime_bridge.h',
209 'ime/chromeos/ime_keyboard.cc',
210 'ime/chromeos/ime_keyboard.h',
211 'ime/chromeos/ime_keyboard_ozone.cc',
212 'ime/chromeos/ime_keyboard_ozone.h',
213 'ime/chromeos/ime_keyboard_x11.cc',
214 'ime/chromeos/ime_keyboard_x11.h',
215 'ime/chromeos/ime_keymap.cc', 199 'ime/chromeos/ime_keymap.cc',
216 'ime/chromeos/ime_keymap.h', 200 'ime/chromeos/ime_keymap.h',
217 'ime/chromeos/input_method_delegate.h',
218 'ime/chromeos/input_method_descriptor.cc',
219 'ime/chromeos/input_method_descriptor.h',
220 'ime/chromeos/input_method_manager.cc',
221 'ime/chromeos/input_method_manager.h',
222 'ime/chromeos/input_method_whitelist.cc',
223 'ime/chromeos/input_method_whitelist.h',
224 'ime/chromeos/mock_component_extension_ime_manager_delegate.cc',
225 'ime/chromeos/mock_component_extension_ime_manager_delegate.h',
226 'ime/chromeos/mock_ime_candidate_window_handler.cc', 201 'ime/chromeos/mock_ime_candidate_window_handler.cc',
227 'ime/chromeos/mock_ime_candidate_window_handler.h', 202 'ime/chromeos/mock_ime_candidate_window_handler.h',
228 'ime/chromeos/mock_ime_engine_handler.cc', 203 'ime/chromeos/mock_ime_engine_handler.cc',
229 'ime/chromeos/mock_ime_engine_handler.h', 204 'ime/chromeos/mock_ime_engine_handler.h',
230 'ime/chromeos/mock_ime_input_context_handler.cc', 205 'ime/chromeos/mock_ime_input_context_handler.cc',
231 'ime/chromeos/mock_ime_input_context_handler.h', 206 'ime/chromeos/mock_ime_input_context_handler.h',
232 'ime/composition_text.cc', 207 'ime/composition_text.cc',
233 'ime/composition_text.h', 208 'ime/composition_text.h',
234 'ime/composition_text_util_pango.cc', 209 'ime/composition_text_util_pango.cc',
235 'ime/composition_text_util_pango.h', 210 'ime/composition_text_util_pango.h',
(...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after
676 'hard_dependency': 1, 651 'hard_dependency': 1,
677 }], 652 }],
678 ['toolkit_views==0 and use_aura==0', { 653 ['toolkit_views==0 and use_aura==0', {
679 'sources!': [ 654 'sources!': [
680 'ime/input_method_factory.cc', 655 'ime/input_method_factory.cc',
681 'ime/input_method_factory.h', 656 'ime/input_method_factory.h',
682 'ime/input_method_minimal.cc', 657 'ime/input_method_minimal.cc',
683 'ime/input_method_minimal.h', 658 'ime/input_method_minimal.h',
684 ], 659 ],
685 }], 660 }],
661 ['chromeos==0', {
662 'sources!': [
663 'ime/input_method_chromeos.cc',
664 'ime/input_method_chromeos.h',
665 ],
666 }],
686 ['chromeos==1', { 667 ['chromeos==1', {
687 'dependencies': [ 668 'dependencies': [
688 '../../chromeos/chromeos.gyp:chromeos', 669 '../../chromeos/chromeos.gyp:chromeos',
689 ], 670 ],
690 }], 671 }],
691 ['OS!="win"', { 672 ['OS!="win"', {
692 'sources!': [ 673 'sources!': [
693 'ime/input_method_imm32.cc', 674 'ime/input_method_imm32.cc',
694 'ime/input_method_imm32.h', 675 'ime/input_method_imm32.h',
695 ], 676 ],
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 ], 766 ],
786 'variables': { 767 'variables': {
787 'jni_gen_package': 'ui', 768 'jni_gen_package': 'ui',
788 }, 769 },
789 'includes': [ '../../build/jni_generator.gypi' ], 770 'includes': [ '../../build/jni_generator.gypi' ],
790 }, 771 },
791 ], 772 ],
792 }], 773 }],
793 ], 774 ],
794 } 775 }
OLDNEW
« no previous file with comments | « ui/base/ime/input_method_chromeos_unittest.cc ('k') | ui/base/ui_base_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698