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

Side by Side Diff: ash/ash.gyp

Issue 379803004: Move UserInfo to user_manager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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 | Annotate | Revision Log
« no previous file with comments | « ash/DEPS ('k') | ash/frame/frame_util.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 'targets': [ 10 'targets': [
11 { 11 {
12 'target_name': 'ash', 12 'target_name': 'ash',
13 'type': '<(component)', 13 'type': '<(component)',
14 'dependencies': [ 14 'dependencies': [
15 '../base/base.gyp:base', 15 '../base/base.gyp:base',
16 '../base/base.gyp:base_i18n', 16 '../base/base.gyp:base_i18n',
17 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 17 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
18 '../cc/cc.gyp:cc', 18 '../cc/cc.gyp:cc',
19 '../components/components.gyp:user_manager',
19 '../content/content.gyp:content_browser', 20 '../content/content.gyp:content_browser',
20 '../media/media.gyp:media', 21 '../media/media.gyp:media',
21 '../net/net.gyp:net', 22 '../net/net.gyp:net',
22 '../skia/skia.gyp:skia', 23 '../skia/skia.gyp:skia',
23 '../third_party/icu/icu.gyp:icui18n', 24 '../third_party/icu/icu.gyp:icui18n',
24 '../third_party/icu/icu.gyp:icuuc', 25 '../third_party/icu/icu.gyp:icuuc',
25 '../ui/accessibility/accessibility.gyp:accessibility', 26 '../ui/accessibility/accessibility.gyp:accessibility',
26 '../ui/app_list/app_list.gyp:app_list', 27 '../ui/app_list/app_list.gyp:app_list',
27 '../ui/aura/aura.gyp:aura', 28 '../ui/aura/aura.gyp:aura',
28 '../ui/base/ui_base.gyp:ui_base', 29 '../ui/base/ui_base.gyp:ui_base',
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 'rotator/screen_rotation.cc', 223 'rotator/screen_rotation.cc',
223 'rotator/screen_rotation.h', 224 'rotator/screen_rotation.h',
224 'scoped_target_root_window.cc', 225 'scoped_target_root_window.cc',
225 'scoped_target_root_window.h', 226 'scoped_target_root_window.h',
226 'screen_util.cc', 227 'screen_util.cc',
227 'screen_util.h', 228 'screen_util.h',
228 'screenshot_delegate.h', 229 'screenshot_delegate.h',
229 'session/session_state_delegate.h', 230 'session/session_state_delegate.h',
230 'session/session_state_observer.cc', 231 'session/session_state_observer.cc',
231 'session/session_state_observer.h', 232 'session/session_state_observer.h',
232 'session/user_info.h',
233 'shelf/app_list_button.cc', 233 'shelf/app_list_button.cc',
234 'shelf/app_list_button.h', 234 'shelf/app_list_button.h',
235 'shelf/app_list_shelf_item_delegate.cc', 235 'shelf/app_list_shelf_item_delegate.cc',
236 'shelf/app_list_shelf_item_delegate.h', 236 'shelf/app_list_shelf_item_delegate.h',
237 'shelf/background_animator.cc', 237 'shelf/background_animator.cc',
238 'shelf/background_animator.h', 238 'shelf/background_animator.h',
239 'shelf/overflow_bubble.cc', 239 'shelf/overflow_bubble.cc',
240 'shelf/overflow_bubble.h', 240 'shelf/overflow_bubble.h',
241 'shelf/overflow_bubble_view.cc', 241 'shelf/overflow_bubble_view.cc',
242 'shelf/overflow_bubble_view.h', 242 'shelf/overflow_bubble_view.h',
(...skipping 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
872 }], 872 }],
873 ], 873 ],
874 }, 874 },
875 { 875 {
876 'target_name': 'ash_unittests', 876 'target_name': 'ash_unittests',
877 'type': 'executable', 877 'type': 'executable',
878 'dependencies': [ 878 'dependencies': [
879 '../base/base.gyp:base', 879 '../base/base.gyp:base',
880 '../base/base.gyp:test_support_base', 880 '../base/base.gyp:test_support_base',
881 '../chrome/chrome_resources.gyp:packed_resources', 881 '../chrome/chrome_resources.gyp:packed_resources',
882 '../components/components.gyp:user_manager',
882 '../content/content.gyp:content_browser', 883 '../content/content.gyp:content_browser',
883 '../content/content_shell_and_tests.gyp:test_support_content', 884 '../content/content_shell_and_tests.gyp:test_support_content',
884 '../skia/skia.gyp:skia', 885 '../skia/skia.gyp:skia',
885 '../testing/gtest.gyp:gtest', 886 '../testing/gtest.gyp:gtest',
886 '../third_party/icu/icu.gyp:icui18n', 887 '../third_party/icu/icu.gyp:icui18n',
887 '../third_party/icu/icu.gyp:icuuc', 888 '../third_party/icu/icu.gyp:icuuc',
888 '../ui/accessibility/accessibility.gyp:accessibility', 889 '../ui/accessibility/accessibility.gyp:accessibility',
889 '../ui/app_list/app_list.gyp:app_list', 890 '../ui/app_list/app_list.gyp:app_list',
890 '../ui/aura/aura.gyp:aura', 891 '../ui/aura/aura.gyp:aura',
891 '../ui/aura/aura.gyp:aura_test_support', 892 '../ui/aura/aura.gyp:aura_test_support',
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
1171 'shell/window_watcher.h', 1172 'shell/window_watcher.h',
1172 'shell/window_watcher_shelf_item_delegate.cc', 1173 'shell/window_watcher_shelf_item_delegate.cc',
1173 'shell/window_watcher_shelf_item_delegate.h', 1174 'shell/window_watcher_shelf_item_delegate.h',
1174 ], 1175 ],
1175 }, 1176 },
1176 { 1177 {
1177 'target_name': 'ash_shell', 1178 'target_name': 'ash_shell',
1178 'type': 'executable', 1179 'type': 'executable',
1179 'dependencies': [ 1180 'dependencies': [
1180 'ash_shell_lib', 1181 'ash_shell_lib',
1182 '../components/components.gyp:user_manager',
1181 ], 1183 ],
1182 'sources': [ 1184 'sources': [
1183 'shell/shell_main.cc', 1185 'shell/shell_main.cc',
1184 ], 1186 ],
1185 'conditions': [ 1187 'conditions': [
1186 ['OS=="win"', { 1188 ['OS=="win"', {
1187 'msvs_settings': { 1189 'msvs_settings': {
1188 'VCLinkerTool': { 1190 'VCLinkerTool': {
1189 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 1191 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
1190 }, 1192 },
1191 }, 1193 },
1192 'dependencies': [ 1194 'dependencies': [
1193 '../sandbox/sandbox.gyp:sandbox', 1195 '../sandbox/sandbox.gyp:sandbox',
1194 ], 1196 ],
1195 }], 1197 }],
1196 ['chromeos==1', { 1198 ['chromeos==1', {
1197 'dependencies': [ 1199 'dependencies': [
1198 » '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1200 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1199 ], 1201 ],
1200 }], 1202 }],
1201 ], 1203 ],
1202 }, 1204 },
1203 { 1205 {
1204 'target_name': 'ash_shell_unittests', 1206 'target_name': 'ash_shell_unittests',
1205 'type': 'executable', 1207 'type': 'executable',
1206 'dependencies': [ 1208 'dependencies': [
1207 '../base/base.gyp:test_support_base', 1209 '../base/base.gyp:test_support_base',
1210 '../components/components.gyp:user_manager',
1208 '../content/content_shell_and_tests.gyp:test_support_content', 1211 '../content/content_shell_and_tests.gyp:test_support_content',
1209 '../skia/skia.gyp:skia', 1212 '../skia/skia.gyp:skia',
1210 '../testing/gtest.gyp:gtest', 1213 '../testing/gtest.gyp:gtest',
1211 '../ui/accessibility/accessibility.gyp:ax_gen', 1214 '../ui/accessibility/accessibility.gyp:ax_gen',
1212 'ash_shell_lib', 1215 'ash_shell_lib',
1213 'ash_test_support', 1216 'ash_test_support',
1214 ], 1217 ],
1215 'sources': [ 1218 'sources': [
1216 'shell/window_watcher_unittest.cc', 1219 'shell/window_watcher_unittest.cc',
1217 'test/ash_unittests.cc', 1220 'test/ash_unittests.cc',
1218 ], 1221 ],
1219 'conditions': [ 1222 'conditions': [
1220 ['chromeos==1', { 1223 ['chromeos==1', {
1221 'dependencies': [ 1224 'dependencies': [
1222 '../ui/display/display.gyp:display', 1225 '../ui/display/display.gyp:display',
1223 ], 1226 ],
1224 }], 1227 }],
1225 ], 1228 ],
1226 }, 1229 },
1227 ], 1230 ],
1228 } 1231 }
OLDNEW
« no previous file with comments | « ash/DEPS ('k') | ash/frame/frame_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698