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

Side by Side Diff: ui/aura/aura.gyp

Issue 8824007: Revert 113224 - IME (input method editor) support for Aura, part 3 of 3: Use ui::InputMethod in u... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « content/public/browser/native_web_keyboard_event.h ('k') | ui/aura/desktop.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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 'layout_manager.cc', 46 'layout_manager.cc',
47 'layout_manager.h', 47 'layout_manager.h',
48 'screen_aura.cc', 48 'screen_aura.cc',
49 'screen_aura.h', 49 'screen_aura.h',
50 'window.cc', 50 'window.cc',
51 'window.h', 51 'window.h',
52 'window_delegate.h', 52 'window_delegate.h',
53 'window_observer.h', 53 'window_observer.h',
54 'window_types.h', 54 'window_types.h',
55 ], 55 ],
56 'conditions': [
57 ['use_ibus==1', {
58 'dependencies': [
59 '../../build/linux/system.gyp:ibus',
60 ],
61 }],
62 ],
63 }, 56 },
64 { 57 {
65 'target_name': 'test_support_aura', 58 'target_name': 'test_support_aura',
66 'type': 'static_library', 59 'type': 'static_library',
67 'dependencies': [ 60 'dependencies': [
68 '../../skia/skia.gyp:skia', 61 '../../skia/skia.gyp:skia',
69 '../../testing/gtest.gyp:gtest', 62 '../../testing/gtest.gyp:gtest',
70 '../gfx/compositor/compositor.gyp:test_compositor', 63 '../gfx/compositor/compositor.gyp:test_compositor',
71 '../ui.gyp:ui', 64 '../ui.gyp:ui',
72 'aura', 65 'aura',
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 'test_support_aura', 124 'test_support_aura',
132 'aura', 125 'aura',
133 ], 126 ],
134 'include_dirs': [ 127 'include_dirs': [
135 '..', 128 '..',
136 ], 129 ],
137 'sources': [ 130 'sources': [
138 'test/run_all_unittests.cc', 131 'test/run_all_unittests.cc',
139 'test/test_suite.cc', 132 'test/test_suite.cc',
140 'test/test_suite.h', 133 'test/test_suite.h',
141 'desktop_host_ime_unittest.cc',
142 'desktop_unittest.cc', 134 'desktop_unittest.cc',
143 'event_filter_unittest.cc', 135 'event_filter_unittest.cc',
144 'window_unittest.cc', 136 'window_unittest.cc',
145 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', 137 '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
146 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', 138 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
147 ], 139 ],
148 # osmesa GL implementation is used on linux. 140 # osmesa GL implementation is used on linux.
149 'conditions': [ 141 'conditions': [
150 ['OS=="linux"', { 142 ['OS=="linux"', {
151 'dependencies': [ 143 'dependencies': [
152 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 144 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
153 ], 145 ],
154 }], 146 }],
155 ], 147 ],
156 }, 148 },
157 ], 149 ],
158 } 150 }
OLDNEW
« no previous file with comments | « content/public/browser/native_web_keyboard_event.h ('k') | ui/aura/desktop.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698