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

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/components/user_manager.gypi
===================================================================
--- trunk/src/components/user_manager.gypi (revision 284418)
+++ trunk/src/components/user_manager.gypi (working copy)
@@ -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)' ],
}],
],
« 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