diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-21 13:12:45 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-21 13:12:45 +0000 |
| commit | 9a3353d2f7418760aba4efae9939b6395d965cee (patch) | |
| tree | b65bc1e031492ddd31ff25a3cf5a6607f3f57f71 /components/user_manager.gypi | |
| parent | 4c64cbecf8c2464858c86f397e943c46d9ebace4 (diff) | |
| download | chromium_src-9a3353d2f7418760aba4efae9939b6395d965cee.zip chromium_src-9a3353d2f7418760aba4efae9939b6395d965cee.tar.gz chromium_src-9a3353d2f7418760aba4efae9939b6395d965cee.tar.bz2 | |
Revert 284417 "Move default user profile images strings and reso..."
> Move default user profile images strings and resources out of src/chrome.
>
> BUG=387614
> R=bauerb@chromium.org, oshima@chromium.org
> TBR=tony@chromium.org
>
> Review URL: https://codereview.chromium.org/400973002
TBR=nkostylev@chromium.org
Review URL: https://codereview.chromium.org/408833004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/user_manager.gypi')
| -rw-r--r-- | components/user_manager.gypi | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/components/user_manager.gypi b/components/user_manager.gypi index 36bc67b..7b22938 100644 --- a/components/user_manager.gypi +++ b/components/user_manager.gypi @@ -16,8 +16,6 @@ ], # Chrome OS user_manager sources. 'user_manager_chromeos_sources': [ - 'user_manager/user_image/default_user_images.cc', - 'user_manager/user_image/default_user_images.h', 'user_manager/user_image/user_image.cc', 'user_manager/user_image/user_image.h', 'user_manager/user_type.h', @@ -27,26 +25,20 @@ 'target_name': 'user_manager', 'type': '<(component)', 'dependencies': [ - '<(DEPTH)/base/base.gyp:base', - '<(DEPTH)/skia/skia.gyp:skia', - '<(DEPTH)/ui/gfx/gfx.gyp:gfx', - '<(DEPTH)/url/url.gyp:url_lib', + '../base/base.gyp:base', + '../skia/skia.gyp:skia', + '../ui/gfx/gfx.gyp:gfx', + '../url/url.gyp:url_lib', ], 'defines': [ 'USER_MANAGER_IMPLEMENTATION', ], 'include_dirs': [ - '<(DEPTH)', - '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', - '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', + '..', ], 'sources': [ '<@(user_manager_shared_sources)' ], 'conditions': [ ['chromeos == 1', { - 'dependencies': [ - '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_resources', - '<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings', - ], 'sources': [ '<@(user_manager_chromeos_sources)' ], }], ], |