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

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: rebase, review 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 'root_window_event_filter.cc', 48 'root_window_event_filter.cc',
49 'root_window_event_filter.h', 49 'root_window_event_filter.h',
50 'root_window_layout_manager.cc', 50 'root_window_layout_manager.cc',
51 'root_window_layout_manager.h', 51 'root_window_layout_manager.h',
52 'drag_drop_controller.cc', 52 'drag_drop_controller.cc',
53 'drag_drop_controller.h', 53 'drag_drop_controller.h',
54 'drag_image_view.cc', 54 'drag_image_view.cc',
55 'drag_image_view.h', 55 'drag_image_view.h',
56 'image_grid.cc', 56 'image_grid.cc',
57 'image_grid.h', 57 'image_grid.h',
58 'input_method_event_filter.cc',
59 'input_method_event_filter.h',
58 'launcher/app_launcher_button.cc', 60 'launcher/app_launcher_button.cc',
59 'launcher/app_launcher_button.h', 61 'launcher/app_launcher_button.h',
60 'launcher/launcher.cc', 62 'launcher/launcher.cc',
61 'launcher/launcher.h', 63 'launcher/launcher.h',
62 'launcher/launcher_model.cc', 64 'launcher/launcher_model.cc',
63 'launcher/launcher_model.h', 65 'launcher/launcher_model.h',
64 'launcher/launcher_model_observer.h', 66 'launcher/launcher_model_observer.h',
65 'launcher/launcher_types.h', 67 'launcher/launcher_types.h',
66 'launcher/launcher_view.cc', 68 'launcher/launcher_view.cc',
67 'launcher/launcher_view.h', 69 'launcher/launcher_view.h',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 'window_util.cc', 116 'window_util.cc',
115 'window_util.h', 117 'window_util.h',
116 'workspace_controller.cc', 118 'workspace_controller.cc',
117 'workspace_controller.h', 119 'workspace_controller.h',
118 'workspace/workspace.cc', 120 'workspace/workspace.cc',
119 'workspace/workspace.h', 121 'workspace/workspace.h',
120 'workspace/workspace_manager.cc', 122 'workspace/workspace_manager.cc',
121 'workspace/workspace_manager.h', 123 'workspace/workspace_manager.h',
122 'workspace/workspace_observer.h', 124 'workspace/workspace_observer.h',
123 ], 125 ],
126 'conditions': [
127 ['use_ibus==1', {
128 'dependencies': [
129 '../../build/linux/system.gyp:ibus',
130 ],
131 }],
132 ],
124 }, 133 },
125 { 134 {
126 'target_name': 'aura_shell_unittests', 135 'target_name': 'aura_shell_unittests',
127 'type': 'executable', 136 'type': 'executable',
128 'dependencies': [ 137 'dependencies': [
129 '../../base/base.gyp:base', 138 '../../base/base.gyp:base',
130 '../../base/base.gyp:test_support_base', 139 '../../base/base.gyp:test_support_base',
131 '../../chrome/chrome_resources.gyp:packed_resources', 140 '../../chrome/chrome_resources.gyp:packed_resources',
132 '../../build/temp_gyp/googleurl.gyp:googleurl', 141 '../../build/temp_gyp/googleurl.gyp:googleurl',
133 '../../skia/skia.gyp:skia', 142 '../../skia/skia.gyp:skia',
134 '../../testing/gtest.gyp:gtest', 143 '../../testing/gtest.gyp:gtest',
135 '../../third_party/icu/icu.gyp:icui18n', 144 '../../third_party/icu/icu.gyp:icui18n',
136 '../../third_party/icu/icu.gyp:icuuc', 145 '../../third_party/icu/icu.gyp:icuuc',
137 '../aura/aura.gyp:aura', 146 '../aura/aura.gyp:aura',
138 '../aura/aura.gyp:test_support_aura', 147 '../aura/aura.gyp:test_support_aura',
139 '../gfx/compositor/compositor.gyp:compositor_test_support', 148 '../gfx/compositor/compositor.gyp:compositor_test_support',
140 '../ui.gyp:gfx_resources', 149 '../ui.gyp:gfx_resources',
141 '../ui.gyp:ui', 150 '../ui.gyp:ui',
142 '../ui.gyp:ui_resources', 151 '../ui.gyp:ui_resources',
143 '../ui.gyp:ui_resources_standard', 152 '../ui.gyp:ui_resources_standard',
144 '../views/views.gyp:views', 153 '../views/views.gyp:views',
145 'aura_shell', 154 'aura_shell',
146 ], 155 ],
147 'sources': [ 156 'sources': [
148 'activation_controller_unittest.cc', 157 'activation_controller_unittest.cc',
149 'default_container_layout_manager_unittest.cc', 158 'default_container_layout_manager_unittest.cc',
150 'root_window_event_filter_unittest.cc', 159 'root_window_event_filter_unittest.cc',
151 'drag_drop_controller_unittest.cc', 160 'drag_drop_controller_unittest.cc',
152 'image_grid_unittest.cc', 161 'image_grid_unittest.cc',
162 'input_method_event_filter_unittest.cc',
153 'launcher/launcher_model_unittest.cc', 163 'launcher/launcher_model_unittest.cc',
154 'launcher/view_model_unittest.cc', 164 'launcher/view_model_unittest.cc',
155 'launcher/view_model_utils_unittest.cc', 165 'launcher/view_model_utils_unittest.cc',
156 'modal_container_layout_manager_unittest.cc', 166 'modal_container_layout_manager_unittest.cc',
157 'run_all_unittests.cc', 167 'run_all_unittests.cc',
158 'shadow_controller_unittest.cc', 168 'shadow_controller_unittest.cc',
159 'shell_accelerator_controller_unittest.cc', 169 'shell_accelerator_controller_unittest.cc',
160 'shell_unittest.cc', 170 'shell_unittest.cc',
161 'test_suite.cc', 171 'test_suite.cc',
162 'test_suite.h', 172 'test_suite.h',
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 'examples/widgets.cc', 228 'examples/widgets.cc',
219 'examples/window_type_launcher.cc', 229 'examples/window_type_launcher.cc',
220 'examples/window_type_launcher.h', 230 'examples/window_type_launcher.h',
221 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 231 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
222 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 232 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
223 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc', 233 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc',
224 ], 234 ],
225 }, 235 },
226 ], 236 ],
227 } 237 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698