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: ash/ash.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 | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/ime/event.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 9
10 'targets': [ 10 'targets': [
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 'app_list/drop_shadow_label.cc', 59 'app_list/drop_shadow_label.cc',
60 'app_list/drop_shadow_label.h', 60 'app_list/drop_shadow_label.h',
61 'ash_switches.cc', 61 'ash_switches.cc',
62 'ash_switches.h', 62 'ash_switches.h',
63 'desktop_background/desktop_background_view.cc', 63 'desktop_background/desktop_background_view.cc',
64 'desktop_background/desktop_background_view.h', 64 'desktop_background/desktop_background_view.h',
65 'drag_drop/drag_drop_controller.cc', 65 'drag_drop/drag_drop_controller.cc',
66 'drag_drop/drag_drop_controller.h', 66 'drag_drop/drag_drop_controller.h',
67 'drag_drop/drag_image_view.cc', 67 'drag_drop/drag_image_view.cc',
68 'drag_drop/drag_image_view.h', 68 'drag_drop/drag_image_view.h',
69 'ime/event.cc',
70 'ime/event.h',
71 'ime/input_method_event_filter.cc',
72 'ime/input_method_event_filter.h',
69 'launcher/app_launcher_button.cc', 73 'launcher/app_launcher_button.cc',
70 'launcher/app_launcher_button.h', 74 'launcher/app_launcher_button.h',
71 'launcher/launcher.cc', 75 'launcher/launcher.cc',
72 'launcher/launcher.h', 76 'launcher/launcher.h',
73 'launcher/launcher_model.cc', 77 'launcher/launcher_model.cc',
74 'launcher/launcher_model.h', 78 'launcher/launcher_model.h',
75 'launcher/launcher_model_observer.h', 79 'launcher/launcher_model_observer.h',
76 'launcher/launcher_types.h', 80 'launcher/launcher_types.h',
77 'launcher/launcher_view.cc', 81 'launcher/launcher_view.cc',
78 'launcher/launcher_view.h', 82 'launcher/launcher_view.h',
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 '../ui/ui.gyp:gfx_resources', 173 '../ui/ui.gyp:gfx_resources',
170 '../ui/ui.gyp:ui', 174 '../ui/ui.gyp:ui',
171 '../ui/ui.gyp:ui_resources', 175 '../ui/ui.gyp:ui_resources',
172 '../ui/ui.gyp:ui_resources_standard', 176 '../ui/ui.gyp:ui_resources_standard',
173 '../ui/views/views.gyp:views', 177 '../ui/views/views.gyp:views',
174 'ash', 178 'ash',
175 ], 179 ],
176 'sources': [ 180 'sources': [
177 'accelerators/accelerator_controller_unittest.cc', 181 'accelerators/accelerator_controller_unittest.cc',
178 'drag_drop/drag_drop_controller_unittest.cc', 182 'drag_drop/drag_drop_controller_unittest.cc',
183 'ime/input_method_event_filter_unittest.cc',
179 'launcher/launcher_model_unittest.cc', 184 'launcher/launcher_model_unittest.cc',
180 'launcher/launcher_unittest.cc', 185 'launcher/launcher_unittest.cc',
181 'launcher/view_model_unittest.cc', 186 'launcher/view_model_unittest.cc',
182 'launcher/view_model_utils_unittest.cc', 187 'launcher/view_model_utils_unittest.cc',
183 'shell_unittest.cc', 188 'shell_unittest.cc',
184 'test/ash_unittests.cc', 189 'test/ash_unittests.cc',
185 'test/aura_shell_test_base.cc', 190 'test/aura_shell_test_base.cc',
186 'test/aura_shell_test_base.h', 191 'test/aura_shell_test_base.h',
187 'test/test_activation_delegate.cc', 192 'test/test_activation_delegate.cc',
188 'test/test_activation_delegate.h', 193 'test/test_activation_delegate.h',
(...skipping 21 matching lines...) Expand all
210 'conditions': [ 215 'conditions': [
211 ['use_webkit_compositor==1', { 216 ['use_webkit_compositor==1', {
212 'dependencies': [ 217 'dependencies': [
213 '../ui/gfx/compositor/compositor.gyp:compositor', 218 '../ui/gfx/compositor/compositor.gyp:compositor',
214 ], 219 ],
215 }, { # use_webkit_compositor!=1 220 }, { # use_webkit_compositor!=1
216 'dependencies': [ 221 'dependencies': [
217 '../ui/gfx/compositor/compositor.gyp:test_compositor', 222 '../ui/gfx/compositor/compositor.gyp:test_compositor',
218 ], 223 ],
219 }], 224 }],
225 ['use_ibus==1', {
226 'dependencies': [
227 '../build/linux/system.gyp:ibus',
228 ],
229 }],
220 ], 230 ],
221 }, 231 },
222 { 232 {
223 'target_name': 'ash_shell', 233 'target_name': 'ash_shell',
224 'type': 'executable', 234 'type': 'executable',
225 'dependencies': [ 235 'dependencies': [
226 '../base/base.gyp:base', 236 '../base/base.gyp:base',
227 '../base/base.gyp:base_i18n', 237 '../base/base.gyp:base_i18n',
228 '../chrome/chrome_resources.gyp:packed_resources', 238 '../chrome/chrome_resources.gyp:packed_resources',
229 '../skia/skia.gyp:skia', 239 '../skia/skia.gyp:skia',
(...skipping 22 matching lines...) Expand all
252 'shell/window_type_launcher.cc', 262 'shell/window_type_launcher.cc',
253 'shell/window_type_launcher.h', 263 'shell/window_type_launcher.h',
254 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 264 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
255 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc', 265 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc',
256 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 266 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
257 '../ui/views/test/test_views_delegate.cc', 267 '../ui/views/test/test_views_delegate.cc',
258 ], 268 ],
259 }, 269 },
260 ], 270 ],
261 } 271 }
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/ime/event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698