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

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

Powered by Google App Engine
This is Rietveld 408576698