diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-17 06:11:05 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-17 06:11:05 +0000 |
| commit | a1e39cd7fd7af8d8a8934737ff09f59388c4d058 (patch) | |
| tree | efe69eefc22134f8a438a5c95e8c38d5c762b65a /chrome | |
| parent | a7b00676ef397d9eaa27aaac02f36e05a07e569c (diff) | |
| download | chromium_src-a1e39cd7fd7af8d8a8934737ff09f59388c4d058.zip chromium_src-a1e39cd7fd7af8d8a8934737ff09f59388c4d058.tar.gz chromium_src-a1e39cd7fd7af8d8a8934737ff09f59388c4d058.tar.bz2 | |
ash: Remove ash_wallpaper_resources.
The default Chrome OS wallpaper is specified on the command
line now.
BUG=248764
Review URL: https://chromiumcodereview.appspot.com/18470004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211970 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc | 2 | ||||
| -rw-r--r-- | chrome/chrome_dll.gypi | 5 | ||||
| -rw-r--r-- | chrome/chrome_repack_chrome.gypi | 5 | ||||
| -rw-r--r-- | chrome/chrome_resources.gyp | 1 | ||||
| -rwxr-xr-x | chrome/tools/check_grd_for_unused_strings.py | 1 |
5 files changed, 1 insertions, 13 deletions
diff --git a/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc b/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc index 0a5b626..aedc8ad 100644 --- a/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc +++ b/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/chromeos/login/wallpaper_manager.h" -#include "ash/ash_resources/grit/ash_wallpaper_resources.h" +#include "ash/ash_resources/grit/ash_resources.h" #include "ash/desktop_background/desktop_background_controller.h" #include "ash/desktop_background/desktop_background_controller_observer.h" #include "ash/display/display_manager.h" diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 090a3d2..7481dfd 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -85,11 +85,6 @@ '../ui/compositor/compositor.gyp:compositor', ], }], - ['use_ash==1', { - 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_wallpaper_resources.rc', - ], - }], ['OS=="win" and target_arch=="ia32"', { # Add a dependency to custom import library for user32 delay # imports only in x86 builds. diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi index 58cab20..33bdd8a 100644 --- a/chrome/chrome_repack_chrome.gypi +++ b/chrome/chrome_repack_chrome.gypi @@ -23,11 +23,6 @@ '<(grit_out_dir)/extensions_api_resources.pak', ], }], - ['use_ash==1', { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/ash/ash_resources/ash_wallpaper_resources.pak', - ], - }], ], }, 'inputs': [ diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index e65f2d0..3084064 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -357,7 +357,6 @@ ['use_ash==1', { 'dependencies': [ '<(DEPTH)/ash/ash.gyp:ash_resources', - '<(DEPTH)/ash/ash.gyp:ash_wallpaper_resources', ], }], ['OS != "mac" and OS != "ios"', { diff --git a/chrome/tools/check_grd_for_unused_strings.py b/chrome/tools/check_grd_for_unused_strings.py index 40e8ed5..6d7768c 100755 --- a/chrome/tools/check_grd_for_unused_strings.py +++ b/chrome/tools/check_grd_for_unused_strings.py @@ -136,7 +136,6 @@ def main(): grd_files = [ os.path.join(ash_base_dir, 'ash_strings.grd'), os.path.join(ash_base_dir, 'resources', 'ash_resources.grd'), - os.path.join(ash_base_dir, 'resources', 'ash_wallpaper_resources.grd'), os.path.join(chrome_app_dir, 'chromium_strings.grd'), os.path.join(chrome_app_dir, 'generated_resources.grd'), os.path.join(chrome_app_dir, 'google_chrome_strings.grd'), |