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

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: moved IME code to aura_shell, not ready for review though 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 'root_window_event_filter.cc', 46 'root_window_event_filter.cc',
47 'root_window_event_filter.h', 47 'root_window_event_filter.h',
48 'root_window_layout_manager.cc', 48 'root_window_layout_manager.cc',
49 'root_window_layout_manager.h', 49 'root_window_layout_manager.h',
50 'drag_drop_controller.cc', 50 'drag_drop_controller.cc',
51 'drag_drop_controller.h', 51 'drag_drop_controller.h',
52 'drag_image_view.cc', 52 'drag_image_view.cc',
53 'drag_image_view.h', 53 'drag_image_view.h',
54 'image_grid.cc', 54 'image_grid.cc',
55 'image_grid.h', 55 'image_grid.h',
56 'input_method_event_filter.cc',
57 'input_method_event_filter.h',
56 'launcher/app_launcher_button.cc', 58 'launcher/app_launcher_button.cc',
57 'launcher/app_launcher_button.h', 59 'launcher/app_launcher_button.h',
58 'launcher/launcher.cc', 60 'launcher/launcher.cc',
59 'launcher/launcher.h', 61 'launcher/launcher.h',
60 'launcher/launcher_model.cc', 62 'launcher/launcher_model.cc',
61 'launcher/launcher_model.h', 63 'launcher/launcher_model.h',
62 'launcher/launcher_model_observer.h', 64 'launcher/launcher_model_observer.h',
63 'launcher/launcher_types.h', 65 'launcher/launcher_types.h',
64 'launcher/launcher_view.cc', 66 'launcher/launcher_view.cc',
65 'launcher/launcher_view.h', 67 'launcher/launcher_view.h',
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 'window_util.cc', 114 'window_util.cc',
113 'window_util.h', 115 'window_util.h',
114 'workspace_controller.cc', 116 'workspace_controller.cc',
115 'workspace_controller.h', 117 'workspace_controller.h',
116 'workspace/workspace.cc', 118 'workspace/workspace.cc',
117 'workspace/workspace.h', 119 'workspace/workspace.h',
118 'workspace/workspace_manager.cc', 120 'workspace/workspace_manager.cc',
119 'workspace/workspace_manager.h', 121 'workspace/workspace_manager.h',
120 'workspace/workspace_observer.h', 122 'workspace/workspace_observer.h',
121 ], 123 ],
124 'conditions': [
125 ['use_ibus==1', {
126 'dependencies': [
127 '../../build/linux/system.gyp:ibus',
128 ],
129 }],
130 ],
122 }, 131 },
123 { 132 {
124 'target_name': 'aura_shell_unittests', 133 'target_name': 'aura_shell_unittests',
125 'type': 'executable', 134 'type': 'executable',
126 'dependencies': [ 135 'dependencies': [
127 '../../base/base.gyp:base', 136 '../../base/base.gyp:base',
128 '../../base/base.gyp:test_support_base', 137 '../../base/base.gyp:test_support_base',
129 '../../chrome/chrome_resources.gyp:packed_resources', 138 '../../chrome/chrome_resources.gyp:packed_resources',
130 '../../build/temp_gyp/googleurl.gyp:googleurl', 139 '../../build/temp_gyp/googleurl.gyp:googleurl',
131 '../../skia/skia.gyp:skia', 140 '../../skia/skia.gyp:skia',
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 'examples/widgets.cc', 221 'examples/widgets.cc',
213 'examples/window_type_launcher.cc', 222 'examples/window_type_launcher.cc',
214 'examples/window_type_launcher.h', 223 'examples/window_type_launcher.h',
215 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 224 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
216 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 225 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
217 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc', 226 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standa rd.rc',
218 ], 227 ],
219 }, 228 },
220 ], 229 ],
221 } 230 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698