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

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: addressed comments Created 9 years, 1 month 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 'layout_manager.cc', 45 'layout_manager.cc',
46 'layout_manager.h', 46 'layout_manager.h',
47 'screen_aura.cc', 47 'screen_aura.cc',
48 'screen_aura.h', 48 'screen_aura.h',
49 'window.cc', 49 'window.cc',
50 'window.h', 50 'window.h',
51 'window_delegate.h', 51 'window_delegate.h',
52 'window_observer.h', 52 'window_observer.h',
53 'window_types.h', 53 'window_types.h',
54 ], 54 ],
55 'conditions': [
56 ['use_ibus==1', {
57 'dependencies': [
58 '../../build/linux/system.gyp:ibus',
59 ],
60 }],
61 ],
55 }, 62 },
56 { 63 {
57 'target_name': 'test_support_aura', 64 'target_name': 'test_support_aura',
58 'type': 'static_library', 65 'type': 'static_library',
59 'dependencies': [ 66 'dependencies': [
60 '../../skia/skia.gyp:skia', 67 '../../skia/skia.gyp:skia',
61 '../../testing/gtest.gyp:gtest', 68 '../../testing/gtest.gyp:gtest',
62 '../gfx/compositor/compositor.gyp:test_compositor', 69 '../gfx/compositor/compositor.gyp:test_compositor',
63 '../ui.gyp:ui', 70 '../ui.gyp:ui',
64 'aura', 71 'aura',
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 'conditions': [ 147 'conditions': [
141 ['OS=="linux"', { 148 ['OS=="linux"', {
142 'dependencies': [ 149 'dependencies': [
143 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 150 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
144 ], 151 ],
145 }], 152 }],
146 ], 153 ],
147 }, 154 },
148 ], 155 ],
149 } 156 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698