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

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: 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 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 ], 136 ],
137 'include_dirs': [ 137 'include_dirs': [
138 '..', 138 '..',
139 ], 139 ],
140 'sources': [ 140 'sources': [
141 'test/run_all_unittests.cc', 141 'test/run_all_unittests.cc',
142 'test/test_suite.cc', 142 'test/test_suite.cc',
143 'test/test_suite.h', 143 'test/test_suite.h',
144 'root_window_unittest.cc', 144 'root_window_unittest.cc',
145 'event_filter_unittest.cc', 145 'event_filter_unittest.cc',
146 'event_unittest.cc',
146 'window_unittest.cc', 147 'window_unittest.cc',
147 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 148 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
148 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 149 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
149 ], 150 ],
150 # osmesa GL implementation is used on linux. 151 # osmesa GL implementation is used on linux.
151 'conditions': [ 152 'conditions': [
152 ['OS=="linux"', { 153 ['OS=="linux"', {
153 'dependencies': [ 154 'dependencies': [
154 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 155 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
155 ], 156 ],
156 }], 157 }],
157 ['use_webkit_compositor==1', { 158 ['use_webkit_compositor==1', {
158 'dependencies': [ 159 'dependencies': [
159 '../gfx/compositor/compositor.gyp:compositor', 160 '../gfx/compositor/compositor.gyp:compositor',
160 ], 161 ],
161 }, { # use_webkit_compositor!=1 162 }, { # use_webkit_compositor!=1
162 'dependencies': [ 163 'dependencies': [
163 '../gfx/compositor/compositor.gyp:test_compositor', 164 '../gfx/compositor/compositor.gyp:test_compositor',
164 ], 165 ],
165 }], 166 }],
166 ], 167 ],
167 }, 168 },
168 ], 169 ],
169 } 170 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698