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

Side by Side Diff: ui/base/ime/ui_base_ime.gyp

Issue 1149223004: Avoid basename conflict in text_composition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 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
« no previous file with comments | « ui/base/ime/input_method_chromeos_unittest.cc ('k') | ui/base/ui_base_tests.gyp » ('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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 17 matching lines...) Expand all
28 'defines': [ 28 'defines': [
29 'UI_BASE_IME_IMPLEMENTATION', 29 'UI_BASE_IME_IMPLEMENTATION',
30 ], 30 ],
31 'sources' : [ 31 'sources' : [
32 'candidate_window.cc', 32 'candidate_window.cc',
33 'candidate_window.h', 33 'candidate_window.h',
34 'chromeos/character_composer.cc', 34 'chromeos/character_composer.cc',
35 'chromeos/character_composer.h', 35 'chromeos/character_composer.h',
36 'chromeos/component_extension_ime_manager.cc', 36 'chromeos/component_extension_ime_manager.cc',
37 'chromeos/component_extension_ime_manager.h', 37 'chromeos/component_extension_ime_manager.h',
38 'chromeos/composition_text.cc', 38 'chromeos/composition_text_chromeos.cc',
39 'chromeos/composition_text.h', 39 'chromeos/composition_text_chromeos.h',
40 'chromeos/extension_ime_util.cc', 40 'chromeos/extension_ime_util.cc',
41 'chromeos/extension_ime_util.h', 41 'chromeos/extension_ime_util.h',
42 'chromeos/fake_ime_keyboard.cc', 42 'chromeos/fake_ime_keyboard.cc',
43 'chromeos/fake_ime_keyboard.h', 43 'chromeos/fake_ime_keyboard.h',
44 'chromeos/fake_input_method_delegate.cc', 44 'chromeos/fake_input_method_delegate.cc',
45 'chromeos/fake_input_method_delegate.h', 45 'chromeos/fake_input_method_delegate.h',
46 'chromeos/ime_bridge.cc', 46 'chromeos/ime_bridge.cc',
47 'chromeos/ime_bridge.h', 47 'chromeos/ime_bridge.h',
48 'chromeos/ime_keyboard.cc', 48 'chromeos/ime_keyboard.cc',
49 'chromeos/ime_keyboard.h', 49 'chromeos/ime_keyboard.h',
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 ['use_x11==0', { 177 ['use_x11==0', {
178 'sources!': [ 178 'sources!': [
179 'composition_text_util_pango.cc', 179 'composition_text_util_pango.cc',
180 'composition_text_util_pango.h', 180 'composition_text_util_pango.h',
181 ], 181 ],
182 }], 182 }],
183 ], 183 ],
184 }, 184 },
185 ], 185 ],
186 } 186 }
OLDNEW
« no previous file with comments | « ui/base/ime/input_method_chromeos_unittest.cc ('k') | ui/base/ui_base_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698