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

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

Issue 9837046: Revert r128507 "Revert r128436 "relanding: disabled workspace_window_resizer test. fixed access-aft… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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 | « ash/wm/workspace/workspace_window_resizer_unittest.cc ('k') | ui/aura/dispatcher_linux.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 'gestures/gesture_point.cc', 68 'gestures/gesture_point.cc',
69 'gestures/gesture_point.h', 69 'gestures/gesture_point.h',
70 'gestures/velocity_calculator.cc', 70 'gestures/velocity_calculator.cc',
71 'gestures/velocity_calculator.h', 71 'gestures/velocity_calculator.h',
72 'gestures/gesture_sequence.cc', 72 'gestures/gesture_sequence.cc',
73 'gestures/gesture_sequence.h', 73 'gestures/gesture_sequence.h',
74 'layout_manager.cc', 74 'layout_manager.cc',
75 'layout_manager.h', 75 'layout_manager.h',
76 'monitor.cc', 76 'monitor.cc',
77 'monitor.h', 77 'monitor.h',
78 'monitor_change_observer_x11.cc',
79 'monitor_change_observer_x11.h',
78 'monitor_manager.cc', 80 'monitor_manager.cc',
79 'monitor_manager.h', 81 'monitor_manager.h',
80 'single_monitor_manager.h', 82 'single_monitor_manager.h',
81 'single_monitor_manager.cc', 83 'single_monitor_manager.cc',
82 'root_window_host.h', 84 'root_window_host.h',
83 'root_window_host_linux.cc', 85 'root_window_host_linux.cc',
84 'root_window_host_linux.h', 86 'root_window_host_linux.h',
85 'root_window_host_mac.h', 87 'root_window_host_mac.h',
86 'root_window_host_mac.mm', 88 'root_window_host_mac.mm',
87 'root_window_host_win.cc', 89 'root_window_host_win.cc',
(...skipping 11 matching lines...) Expand all
99 'window_delegate.h', 101 'window_delegate.h',
100 'window_observer.h', 102 'window_observer.h',
101 ], 103 ],
102 'conditions': [ 104 'conditions': [
103 ['OS=="mac"', { 105 ['OS=="mac"', {
104 'sources/': [ 106 'sources/': [
105 ['exclude', 'client/dispatcher_client.cc'], 107 ['exclude', 'client/dispatcher_client.cc'],
106 ['exclude', 'client/dispatcher_client.h'], 108 ['exclude', 'client/dispatcher_client.h'],
107 ], 109 ],
108 }], 110 }],
111 ['OS=="linux"', {
112 'link_settings': {
113 'libraries': [
114 '-lXrandr',
115 ],
116 },
117 }],
109 ], 118 ],
110 }, 119 },
111 { 120 {
112 'target_name': 'test_support_aura', 121 'target_name': 'test_support_aura',
113 'type': 'static_library', 122 'type': 'static_library',
114 'dependencies': [ 123 'dependencies': [
115 '../../skia/skia.gyp:skia', 124 '../../skia/skia.gyp:skia',
116 '../../testing/gtest.gyp:gtest', 125 '../../testing/gtest.gyp:gtest',
117 '../ui.gyp:ui', 126 '../ui.gyp:ui',
118 'aura', 127 'aura',
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 # osmesa GL implementation is used on linux. 212 # osmesa GL implementation is used on linux.
204 ['OS=="linux"', { 213 ['OS=="linux"', {
205 'dependencies': [ 214 'dependencies': [
206 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa', 215 '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
207 ], 216 ],
208 }], 217 }],
209 ], 218 ],
210 }, 219 },
211 ], 220 ],
212 } 221 }
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer_unittest.cc ('k') | ui/aura/dispatcher_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698