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

Side by Side Diff: ui/aura_shell/aura_shell.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: Fix Windows support Created 9 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 | 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 9
10 'targets': [ 10 'targets': [
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 'compact_layout_manager.cc', 44 'compact_layout_manager.cc',
45 'compact_layout_manager.h', 45 'compact_layout_manager.h',
46 'compact_status_area_layout_manager.cc', 46 'compact_status_area_layout_manager.cc',
47 'compact_status_area_layout_manager.h', 47 'compact_status_area_layout_manager.h',
48 'default_container_event_filter.cc', 48 'default_container_event_filter.cc',
49 'default_container_event_filter.h', 49 'default_container_event_filter.h',
50 'default_container_layout_manager.cc', 50 'default_container_layout_manager.cc',
51 'default_container_layout_manager.h', 51 'default_container_layout_manager.h',
52 'desktop_background_view.cc', 52 'desktop_background_view.cc',
53 'desktop_background_view.h', 53 'desktop_background_view.h',
54 'event.cc',
55 'event.h',
54 'root_window_event_filter.cc', 56 'root_window_event_filter.cc',
55 'root_window_event_filter.h', 57 'root_window_event_filter.h',
56 'root_window_layout_manager.cc', 58 'root_window_layout_manager.cc',
57 'root_window_layout_manager.h', 59 'root_window_layout_manager.h',
58 'drag_drop_controller.cc', 60 'drag_drop_controller.cc',
59 'drag_drop_controller.h', 61 'drag_drop_controller.h',
60 'drag_image_view.cc', 62 'drag_image_view.cc',
61 'drag_image_view.h', 63 'drag_image_view.h',
62 'image_grid.cc', 64 'image_grid.cc',
63 'image_grid.h', 65 'image_grid.h',
66 'input_method_event_filter.cc',
67 'input_method_event_filter.h',
64 'launcher/app_launcher_button.cc', 68 'launcher/app_launcher_button.cc',
65 'launcher/app_launcher_button.h', 69 'launcher/app_launcher_button.h',
66 'launcher/launcher.cc', 70 'launcher/launcher.cc',
67 'launcher/launcher.h', 71 'launcher/launcher.h',
68 'launcher/launcher_model.cc', 72 'launcher/launcher_model.cc',
69 'launcher/launcher_model.h', 73 'launcher/launcher_model.h',
70 'launcher/launcher_model_observer.h', 74 'launcher/launcher_model_observer.h',
71 'launcher/launcher_types.h', 75 'launcher/launcher_types.h',
72 'launcher/launcher_view.cc', 76 'launcher/launcher_view.cc',
73 'launcher/launcher_view.h', 77 'launcher/launcher_view.h',
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 'window_util.cc', 128 'window_util.cc',
125 'window_util.h', 129 'window_util.h',
126 'workspace_controller.cc', 130 'workspace_controller.cc',
127 'workspace_controller.h', 131 'workspace_controller.h',
128 'workspace/workspace.cc', 132 'workspace/workspace.cc',
129 'workspace/workspace.h', 133 'workspace/workspace.h',
130 'workspace/workspace_manager.cc', 134 'workspace/workspace_manager.cc',
131 'workspace/workspace_manager.h', 135 'workspace/workspace_manager.h',
132 'workspace/workspace_observer.h', 136 'workspace/workspace_observer.h',
133 ], 137 ],
138 'conditions': [
139 ['use_ibus==1', {
140 'dependencies': [
141 '../../build/linux/system.gyp:ibus',
142 ],
143 }],
144 ],
134 }, 145 },
135 { 146 {
136 'target_name': 'aura_shell_unittests', 147 'target_name': 'aura_shell_unittests',
137 'type': 'executable', 148 'type': 'executable',
138 'dependencies': [ 149 'dependencies': [
139 '../../base/base.gyp:base', 150 '../../base/base.gyp:base',
140 '../../base/base.gyp:test_support_base', 151 '../../base/base.gyp:test_support_base',
141 '../../chrome/chrome_resources.gyp:packed_resources', 152 '../../chrome/chrome_resources.gyp:packed_resources',
142 '../../build/temp_gyp/googleurl.gyp:googleurl', 153 '../../build/temp_gyp/googleurl.gyp:googleurl',
143 '../../skia/skia.gyp:skia', 154 '../../skia/skia.gyp:skia',
144 '../../testing/gtest.gyp:gtest', 155 '../../testing/gtest.gyp:gtest',
145 '../../third_party/icu/icu.gyp:icui18n', 156 '../../third_party/icu/icu.gyp:icui18n',
146 '../../third_party/icu/icu.gyp:icuuc', 157 '../../third_party/icu/icu.gyp:icuuc',
147 '../aura/aura.gyp:aura', 158 '../aura/aura.gyp:aura',
148 '../aura/aura.gyp:test_support_aura', 159 '../aura/aura.gyp:test_support_aura',
149 '../gfx/compositor/compositor.gyp:compositor_test_support', 160 '../gfx/compositor/compositor.gyp:compositor_test_support',
150 '../ui.gyp:gfx_resources', 161 '../ui.gyp:gfx_resources',
151 '../ui.gyp:ui', 162 '../ui.gyp:ui',
152 '../ui.gyp:ui_resources', 163 '../ui.gyp:ui_resources',
153 '../ui.gyp:ui_resources_standard', 164 '../ui.gyp:ui_resources_standard',
154 '../views/views.gyp:views', 165 '../views/views.gyp:views',
155 'aura_shell', 166 'aura_shell',
156 ], 167 ],
157 'sources': [ 168 'sources': [
158 'activation_controller_unittest.cc', 169 'activation_controller_unittest.cc',
159 'default_container_layout_manager_unittest.cc', 170 'default_container_layout_manager_unittest.cc',
160 'root_window_event_filter_unittest.cc', 171 'root_window_event_filter_unittest.cc',
161 'drag_drop_controller_unittest.cc', 172 'drag_drop_controller_unittest.cc',
162 'image_grid_unittest.cc', 173 'image_grid_unittest.cc',
174 'input_method_event_filter_unittest.cc',
163 'launcher/launcher_model_unittest.cc', 175 'launcher/launcher_model_unittest.cc',
164 'launcher/launcher_unittest.cc', 176 'launcher/launcher_unittest.cc',
165 'launcher/view_model_unittest.cc', 177 'launcher/view_model_unittest.cc',
166 'launcher/view_model_utils_unittest.cc', 178 'launcher/view_model_utils_unittest.cc',
167 'modal_container_layout_manager_unittest.cc', 179 'modal_container_layout_manager_unittest.cc',
168 'run_all_unittests.cc', 180 'run_all_unittests.cc',
169 'shadow_controller_unittest.cc', 181 'shadow_controller_unittest.cc',
170 'shelf_layout_manager_unittest.cc', 182 'shelf_layout_manager_unittest.cc',
171 'shell_accelerator_controller_unittest.cc', 183 'shell_accelerator_controller_unittest.cc',
172 'shell_unittest.cc', 184 'shell_unittest.cc',
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 'examples/widgets.cc', 242 'examples/widgets.cc',
231 'examples/window_type_launcher.cc', 243 'examples/window_type_launcher.cc',
232 'examples/window_type_launcher.h', 244 'examples/window_type_launcher.h',
233 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 245 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
234 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 246 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
235 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc', 247 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc',
236 ], 248 ],
237 }, 249 },
238 ], 250 ],
239 } 251 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698