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

Side by Side Diff: ui/aura/aura.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 | « content/public/browser/native_web_keyboard_event.h ('k') | ui/aura/client/aura_constants.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 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 ], 139 ],
140 'include_dirs': [ 140 'include_dirs': [
141 '..', 141 '..',
142 ], 142 ],
143 'sources': [ 143 'sources': [
144 'test/run_all_unittests.cc', 144 'test/run_all_unittests.cc',
145 'test/test_suite.cc', 145 'test/test_suite.cc',
146 'test/test_suite.h', 146 'test/test_suite.h',
147 'root_window_unittest.cc', 147 'root_window_unittest.cc',
148 'event_filter_unittest.cc', 148 'event_filter_unittest.cc',
149 'event_unittest.cc',
149 'window_unittest.cc', 150 'window_unittest.cc',
150 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 151 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
151 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 152 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
152 ], 153 ],
153 # osmesa GL implementation is used on linux. 154 # osmesa GL implementation is used on linux.
154 'conditions': [ 155 'conditions': [
155 ['OS=="linux"', { 156 ['OS=="linux"', {
156 'dependencies': [ 157 'dependencies': [
157 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 158 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
158 ], 159 ],
159 }], 160 }],
160 ['use_webkit_compositor==1', { 161 ['use_webkit_compositor==1', {
161 'dependencies': [ 162 'dependencies': [
162 '../gfx/compositor/compositor.gyp:compositor', 163 '../gfx/compositor/compositor.gyp:compositor',
163 ], 164 ],
164 }, { # use_webkit_compositor!=1 165 }, { # use_webkit_compositor!=1
165 'dependencies': [ 166 'dependencies': [
166 '../gfx/compositor/compositor.gyp:test_compositor', 167 '../gfx/compositor/compositor.gyp:test_compositor',
167 ], 168 ],
168 }], 169 }],
169 ], 170 ],
170 }, 171 },
171 ], 172 ],
172 } 173 }
OLDNEW
« no previous file with comments | « content/public/browser/native_web_keyboard_event.h ('k') | ui/aura/client/aura_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698