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

Side by Side Diff: chrome/chrome_browser_chromeos.gypi

Issue 2018753003: Moves ash/wm/common back into ash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove BUILD.gn again Created 4 years, 6 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/wm/common/workspace/workspace_window_resizer.h ('k') | chrome/chrome_browser_ui.gypi » ('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 # 2 #
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 { 6 {
7 'variables': { 7 'variables': {
8 # These files lists are shared with the GN build. 8 # These files lists are shared with the GN build.
9 'browser_chromeos_sources': [ 9 'browser_chromeos_sources': [
10 # All .cc, .h, .m, and .mm files under browser/chromeos, except for test s 10 # All .cc, .h, .m, and .mm files under browser/chromeos, except for test s
(...skipping 1262 matching lines...) Expand 10 before | Expand all | Expand 10 after
1273 'defines': [ 1273 'defines': [
1274 'USE_CRAS', 1274 'USE_CRAS',
1275 ], 1275 ],
1276 }], 1276 }],
1277 ['use_ash==1', { 1277 ['use_ash==1', {
1278 'dependencies': [ 1278 'dependencies': [
1279 '../ash/ash.gyp:ash', 1279 '../ash/ash.gyp:ash',
1280 '../ash/ash.gyp:ash_with_content', 1280 '../ash/ash.gyp:ash_with_content',
1281 '../ash/ash_resources.gyp:ash_resources', 1281 '../ash/ash_resources.gyp:ash_resources',
1282 '../ash/ash_strings.gyp:ash_strings', 1282 '../ash/ash_strings.gyp:ash_strings',
1283 '../ash/wm/common/ash_wm_common.gyp:ash_wm_common',
1284 '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resource s', 1283 '../ash/wm/common/ash_wm_common_resources.gyp:ash_wm_common_resource s',
1285 '../components/components.gyp:session_manager_component', 1284 '../components/components.gyp:session_manager_component',
1286 '../components/components.gyp:user_manager', 1285 '../components/components.gyp:user_manager',
1287 '../ui/app_list/app_list.gyp:app_list', 1286 '../ui/app_list/app_list.gyp:app_list',
1288 '../ui/message_center/message_center.gyp:message_center', 1287 '../ui/message_center/message_center.gyp:message_center',
1289 ], 1288 ],
1290 }], 1289 }],
1291 ['use_aura==1', { 1290 ['use_aura==1', {
1292 'dependencies': [ 1291 'dependencies': [
1293 '../ui/aura/aura.gyp:aura', 1292 '../ui/aura/aura.gyp:aura',
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
1359 'browser/chromeos/attestation/attestation_signed_data.proto', 1358 'browser/chromeos/attestation/attestation_signed_data.proto',
1360 ], 1359 ],
1361 'variables': { 1360 'variables': {
1362 'proto_in_dir': 'browser/chromeos/attestation', 1361 'proto_in_dir': 'browser/chromeos/attestation',
1363 'proto_out_dir': 'chrome/browser/chromeos/attestation', 1362 'proto_out_dir': 'chrome/browser/chromeos/attestation',
1364 }, 1363 },
1365 'includes': [ '../build/protoc.gypi' ] 1364 'includes': [ '../build/protoc.gypi' ]
1366 }, 1365 },
1367 ], 1366 ],
1368 } 1367 }
OLDNEW
« no previous file with comments | « ash/wm/common/workspace/workspace_window_resizer.h ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698