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

Side by Side Diff: trunk/src/ash/ash.gyp

Issue 276773004: Revert 269892 "linux_aura: Compile ash into chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 | « trunk/src/ash/accelerators/magnifier_key_scroller.cc ('k') | trunk/src/ash/ash_constants.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 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 }, 9 },
10 'includes': [ 10 'includes': [
(...skipping 999 matching lines...) Expand 10 before | Expand all | Expand 10 after
1010 'wm/workspace/workspace_event_handler_test_helper.cc', 1010 'wm/workspace/workspace_event_handler_test_helper.cc',
1011 'wm/workspace/workspace_event_handler_test_helper.h', 1011 'wm/workspace/workspace_event_handler_test_helper.h',
1012 'wm/workspace/workspace_event_handler_unittest.cc', 1012 'wm/workspace/workspace_event_handler_unittest.cc',
1013 'wm/workspace/workspace_layout_manager_unittest.cc', 1013 'wm/workspace/workspace_layout_manager_unittest.cc',
1014 'wm/workspace/workspace_window_resizer_unittest.cc', 1014 'wm/workspace/workspace_window_resizer_unittest.cc',
1015 'wm/workspace_controller_test_helper.cc', 1015 'wm/workspace_controller_test_helper.cc',
1016 'wm/workspace_controller_test_helper.h', 1016 'wm/workspace_controller_test_helper.h',
1017 'wm/workspace_controller_unittest.cc', 1017 'wm/workspace_controller_unittest.cc',
1018 ], 1018 ],
1019 'conditions': [ 1019 'conditions': [
1020 ['chromeos==0', { 1020 ['OS=="win"', {
1021 'sources/': [ 1021 'sources/': [
1022 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26 906 1022 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26 906
1023 ['exclude', 'focus_cycler_unittest.cc'], 1023 ['exclude', 'focus_cycler_unittest.cc'],
1024 # All tests for multiple displays: not supported on Windows Ash. 1024 # All tests for multiple displays: not supported on Windows Ash.
1025 ['exclude', 'accelerators/nested_dispatcher_controller_unittest.cc'] , 1025 ['exclude', 'accelerators/nested_dispatcher_controller_unittest.cc'] ,
1026 ['exclude', 'wm/drag_window_resizer_unittest.cc'], 1026 ['exclude', 'wm/drag_window_resizer_unittest.cc'],
1027 # Can't resize on Windows Ash. http://crbug.com/165962 1027 # Can't resize on Windows Ash. http://crbug.com/165962
1028 ['exclude', 'ash_root_window_transformer_unittest.cc'], 1028 ['exclude', 'ash_root_window_transformer_unittest.cc'],
1029 ['exclude', 'magnifier/magnification_controller_unittest.cc'], 1029 ['exclude', 'magnifier/magnification_controller_unittest.cc'],
1030 ['exclude', 'wm/workspace/workspace_window_resizer_unittest.cc'], 1030 ['exclude', 'wm/workspace/workspace_window_resizer_unittest.cc'],
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
1189 'ash_shell_lib', 1189 'ash_shell_lib',
1190 'ash_test_support', 1190 'ash_test_support',
1191 ], 1191 ],
1192 'sources': [ 1192 'sources': [
1193 'shell/window_watcher_unittest.cc', 1193 'shell/window_watcher_unittest.cc',
1194 'test/ash_unittests.cc', 1194 'test/ash_unittests.cc',
1195 ], 1195 ],
1196 }, 1196 },
1197 ], 1197 ],
1198 } 1198 }
OLDNEW
« no previous file with comments | « trunk/src/ash/accelerators/magnifier_key_scroller.cc ('k') | trunk/src/ash/ash_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698