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

Side by Side Diff: ash/ash.gyp

Issue 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names
Patch Set: Update after review. Created 5 years, 1 month 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
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 929 matching lines...) Expand 10 before | Expand all | Expand 10 after
940 { 940 {
941 # GN version: //ash 941 # GN version: //ash
942 'target_name': 'ash', 942 'target_name': 'ash',
943 'type': '<(component)', 943 'type': '<(component)',
944 'dependencies': [ 944 'dependencies': [
945 '../base/base.gyp:base', 945 '../base/base.gyp:base',
946 '../base/base.gyp:base_i18n', 946 '../base/base.gyp:base_i18n',
947 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 947 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
948 '../cc/cc.gyp:cc', 948 '../cc/cc.gyp:cc',
949 '../components/components.gyp:device_event_log_component', 949 '../components/components.gyp:device_event_log_component',
950 '../components/components.gyp:signin_core_account_id',
950 '../components/components.gyp:user_manager', 951 '../components/components.gyp:user_manager',
951 '../components/components.gyp:wallpaper', 952 '../components/components.gyp:wallpaper',
952 '../content/content.gyp:content_browser', 953 '../content/content.gyp:content_browser',
953 '../media/media.gyp:media', 954 '../media/media.gyp:media',
954 '../net/net.gyp:net', 955 '../net/net.gyp:net',
955 '../skia/skia.gyp:skia', 956 '../skia/skia.gyp:skia',
956 '../third_party/icu/icu.gyp:icui18n', 957 '../third_party/icu/icu.gyp:icui18n',
957 '../third_party/icu/icu.gyp:icuuc', 958 '../third_party/icu/icu.gyp:icuuc',
958 '../ui/accessibility/accessibility.gyp:accessibility', 959 '../ui/accessibility/accessibility.gyp:accessibility',
959 '../ui/app_list/app_list.gyp:app_list', 960 '../ui/app_list/app_list.gyp:app_list',
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
1136 ], 1137 ],
1137 }, 1138 },
1138 { 1139 {
1139 # GN version: //ash:ash_unittests 1140 # GN version: //ash:ash_unittests
1140 'target_name': 'ash_unittests', 1141 'target_name': 'ash_unittests',
1141 'type': 'executable', 1142 'type': 'executable',
1142 'dependencies': [ 1143 'dependencies': [
1143 '../base/base.gyp:base', 1144 '../base/base.gyp:base',
1144 '../base/base.gyp:test_support_base', 1145 '../base/base.gyp:test_support_base',
1145 '../chrome/chrome_resources.gyp:packed_resources', 1146 '../chrome/chrome_resources.gyp:packed_resources',
1147 '../components/components.gyp:signin_core_account_id',
1146 '../components/components.gyp:user_manager', 1148 '../components/components.gyp:user_manager',
1147 '../content/content.gyp:content_browser', 1149 '../content/content.gyp:content_browser',
1148 '../content/content_shell_and_tests.gyp:test_support_content', 1150 '../content/content_shell_and_tests.gyp:test_support_content',
1149 '../skia/skia.gyp:skia', 1151 '../skia/skia.gyp:skia',
1150 '../testing/gtest.gyp:gtest', 1152 '../testing/gtest.gyp:gtest',
1151 '../third_party/icu/icu.gyp:icui18n', 1153 '../third_party/icu/icu.gyp:icui18n',
1152 '../third_party/icu/icu.gyp:icuuc', 1154 '../third_party/icu/icu.gyp:icuuc',
1153 '../ui/accessibility/accessibility.gyp:accessibility', 1155 '../ui/accessibility/accessibility.gyp:accessibility',
1154 '../ui/app_list/app_list.gyp:app_list', 1156 '../ui/app_list/app_list.gyp:app_list',
1155 '../ui/aura/aura.gyp:aura', 1157 '../ui/aura/aura.gyp:aura',
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
1362 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1364 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1363 ], 1365 ],
1364 } 1366 }
1365 ], 1367 ],
1366 ], 1368 ],
1367 }, 1369 },
1368 ], 1370 ],
1369 }], 1371 }],
1370 ], 1372 ],
1371 } 1373 }
OLDNEW
« no previous file with comments | « ash/DEPS ('k') | ash/system/DEPS » ('j') | ash/test/test_session_state_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698