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

Side by Side Diff: components/user_manager.gypi

Issue 376193002: Move UserImage to user_manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: bring back gfx::ImageSkia 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
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/user_info.h', 9 'user_manager/user_info.h',
10 'user_manager/user_manager_export.h', 10 'user_manager/user_manager_export.h',
11 ], 11 ],
12 # Chrome OS user_manager sources. 12 # Chrome OS user_manager sources.
13 'user_manager_chromeos_sources': [ 13 'user_manager_chromeos_sources': [
14 'user_manager/avatar/user_image.cc',
15 'user_manager/avatar/user_image.h',
14 'user_manager/user_type.h', 16 'user_manager/user_type.h',
15 ], 17 ],
16 }, 18 },
17 'targets': [{ 19 'targets': [{
18 'target_name': 'user_manager', 20 'target_name': 'user_manager',
19 'type': '<(component)', 21 'type': '<(component)',
20 'dependencies': [ 22 'dependencies': [
21 '../base/base.gyp:base', 23 '../base/base.gyp:base',
24 '../skia/skia.gyp:skia',
blundell 2014/07/09 13:57:04 this should have a ui dependency.
Nikita (slow) 2014/07/09 14:18:03 Done.
22 ], 25 ],
23 'defines': [ 26 'defines': [
24 'USER_MANAGER_IMPLEMENTATION', 27 'USER_MANAGER_IMPLEMENTATION',
25 ], 28 ],
26 'include_dirs': [ 29 'include_dirs': [
27 '..', 30 '..',
28 ], 31 ],
29 'sources': [ '<@(user_manager_shared_sources)' ], 32 'sources': [ '<@(user_manager_shared_sources)' ],
30 'conditions': [ 33 'conditions': [
31 ['chromeos == 1', { 34 ['chromeos == 1', {
32 'sources': [ '<@(user_manager_chromeos_sources)' ], 35 'sources': [ '<@(user_manager_chromeos_sources)' ],
33 }], 36 }],
34 ], 37 ],
35 }], 38 }],
36 } 39 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698