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

Side by Side Diff: trunk/src/components/user_manager.gypi

Issue 408833004: Revert 284417 "Move default user profile images strings and reso..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 | « trunk/src/chrome/chrome_browser_chromeos.gypi ('k') | trunk/src/components/user_manager/DEPS » ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 # Cross-platform user_manager sources. 7 # Cross-platform user_manager sources.
8 'user_manager_shared_sources': [ 8 'user_manager_shared_sources': [
9 'user_manager/empty_user_info.cc', 9 'user_manager/empty_user_info.cc',
10 'user_manager/empty_user_info.h', 10 'user_manager/empty_user_info.h',
11 'user_manager/user_info.h', 11 'user_manager/user_info.h',
12 'user_manager/user_info.cc', 12 'user_manager/user_info.cc',
13 'user_manager/user_info_impl.cc', 13 'user_manager/user_info_impl.cc',
14 'user_manager/user_info_impl.h', 14 'user_manager/user_info_impl.h',
15 'user_manager/user_manager_export.h', 15 'user_manager/user_manager_export.h',
16 ], 16 ],
17 # Chrome OS user_manager sources. 17 # Chrome OS user_manager sources.
18 'user_manager_chromeos_sources': [ 18 'user_manager_chromeos_sources': [
19 'user_manager/user_image/default_user_images.cc',
20 'user_manager/user_image/default_user_images.h',
21 'user_manager/user_image/user_image.cc', 19 'user_manager/user_image/user_image.cc',
22 'user_manager/user_image/user_image.h', 20 'user_manager/user_image/user_image.h',
23 'user_manager/user_type.h', 21 'user_manager/user_type.h',
24 ], 22 ],
25 }, 23 },
26 'targets': [{ 24 'targets': [{
27 'target_name': 'user_manager', 25 'target_name': 'user_manager',
28 'type': '<(component)', 26 'type': '<(component)',
29 'dependencies': [ 27 'dependencies': [
30 '<(DEPTH)/base/base.gyp:base', 28 '../base/base.gyp:base',
31 '<(DEPTH)/skia/skia.gyp:skia', 29 '../skia/skia.gyp:skia',
32 '<(DEPTH)/ui/gfx/gfx.gyp:gfx', 30 '../ui/gfx/gfx.gyp:gfx',
33 '<(DEPTH)/url/url.gyp:url_lib', 31 '../url/url.gyp:url_lib',
34 ], 32 ],
35 'defines': [ 33 'defines': [
36 'USER_MANAGER_IMPLEMENTATION', 34 'USER_MANAGER_IMPLEMENTATION',
37 ], 35 ],
38 'include_dirs': [ 36 'include_dirs': [
39 '<(DEPTH)', 37 '..',
40 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
41 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
42 ], 38 ],
43 'sources': [ '<@(user_manager_shared_sources)' ], 39 'sources': [ '<@(user_manager_shared_sources)' ],
44 'conditions': [ 40 'conditions': [
45 ['chromeos == 1', { 41 ['chromeos == 1', {
46 'dependencies': [
47 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources',
48 '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',
49 ],
50 'sources': [ '<@(user_manager_chromeos_sources)' ], 42 'sources': [ '<@(user_manager_chromeos_sources)' ],
51 }], 43 }],
52 ], 44 ],
53 }], 45 }],
54 } 46 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/chrome_browser_chromeos.gypi ('k') | trunk/src/components/user_manager/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698