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

Side by Side Diff: ash/ash.gyp

Issue 2153493002: Revert of ash: Refactor touch hud drawing to ash/touch_hud. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « ash/BUILD.gn ('k') | ash/ash_touch_hud.gyp » ('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 # These files lists are shared with the GN build. 8 # These files lists are shared with the GN build.
9 'ash_sources': [ 9 'ash_sources': [
10 'accelerators/accelerator_commands.cc', 10 'accelerators/accelerator_commands.cc',
(...skipping 1061 matching lines...) Expand 10 before | Expand all | Expand 10 after
1072 '../ui/message_center/message_center.gyp:message_center', 1072 '../ui/message_center/message_center.gyp:message_center',
1073 '../ui/native_theme/native_theme.gyp:native_theme', 1073 '../ui/native_theme/native_theme.gyp:native_theme',
1074 '../ui/platform_window/stub/stub_window.gyp:stub_window', 1074 '../ui/platform_window/stub/stub_window.gyp:stub_window',
1075 '../ui/resources/ui_resources.gyp:ui_resources', 1075 '../ui/resources/ui_resources.gyp:ui_resources',
1076 '../ui/strings/ui_strings.gyp:ui_strings', 1076 '../ui/strings/ui_strings.gyp:ui_strings',
1077 '../ui/views/views.gyp:views', 1077 '../ui/views/views.gyp:views',
1078 '../ui/wm/wm.gyp:wm', 1078 '../ui/wm/wm.gyp:wm',
1079 '../url/url.gyp:url_lib', 1079 '../url/url.gyp:url_lib',
1080 'ash_resources.gyp:ash_resources', 1080 'ash_resources.gyp:ash_resources',
1081 'ash_strings.gyp:ash_strings', 1081 'ash_strings.gyp:ash_strings',
1082 'ash_touch_hud.gyp:ash_touch_hud',
1083 ], 1082 ],
1084 'defines': [ 1083 'defines': [
1085 'ASH_IMPLEMENTATION', 1084 'ASH_IMPLEMENTATION',
1086 ], 1085 ],
1087 'sources': [ 1086 'sources': [
1088 '<@(ash_sources)', 1087 '<@(ash_sources)',
1089 ], 1088 ],
1090 'conditions': [ 1089 'conditions': [
1091 ['OS=="win"', { 1090 ['OS=="win"', {
1092 'sources!': [ 1091 'sources!': [
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
1280 '../ui/wm/wm.gyp:wm', 1279 '../ui/wm/wm.gyp:wm',
1281 '../ui/wm/wm.gyp:wm_test_support', 1280 '../ui/wm/wm.gyp:wm_test_support',
1282 '../url/url.gyp:url_lib', 1281 '../url/url.gyp:url_lib',
1283 'ash', 1282 'ash',
1284 'ash_resources.gyp:ash_resources', 1283 'ash_resources.gyp:ash_resources',
1285 'ash_resources.gyp:ash_test_resources_100_percent', 1284 'ash_resources.gyp:ash_test_resources_100_percent',
1286 'ash_resources.gyp:ash_test_resources_200_percent', 1285 'ash_resources.gyp:ash_test_resources_200_percent',
1287 'ash_strings.gyp:ash_strings', 1286 'ash_strings.gyp:ash_strings',
1288 'ash_strings.gyp:ash_test_strings', 1287 'ash_strings.gyp:ash_test_strings',
1289 'ash_test_support', 1288 'ash_test_support',
1290 'ash_touch_hud.gyp:ash_touch_hud',
1291 'ash_with_content', 1289 'ash_with_content',
1292 ], 1290 ],
1293 'sources': [ 1291 'sources': [
1294 '<@(ash_unittests_sources)', 1292 '<@(ash_unittests_sources)',
1295 ], 1293 ],
1296 'conditions': [ 1294 'conditions': [
1297 ['chromeos==0', { 1295 ['chromeos==0', {
1298 'sources!': [ 1296 'sources!': [
1299 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26 906 1297 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26 906
1300 'focus_cycler_unittest.cc', 1298 'focus_cycler_unittest.cc',
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
1453 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1451 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1454 ], 1452 ],
1455 } 1453 }
1456 ], 1454 ],
1457 ], 1455 ],
1458 }, 1456 },
1459 ], 1457 ],
1460 }], 1458 }],
1461 ], 1459 ],
1462 } 1460 }
OLDNEW
« no previous file with comments | « ash/BUILD.gn ('k') | ash/ash_touch_hud.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698