ash: Rename default wallpaper images.

This renames ash's default wallpaper images (which had
"gradient" in their name despite not being gradients) and
removes old references in .gitignore to the now-unused
google_wallpapers dependency.

BUG=248764

Review URL: https://chromiumcodereview.appspot.com/19683004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212294 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 6 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 16a46a9..df9939b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,6 @@ v8.log
 /Makefile
 /_out
 /arm-sysroot
-/ash/resources/google_wallpapers/
 /breakpad/src/
 /build/Debug
 /build/Debug_x64
@@ -300,7 +299,6 @@ v8.log
 /tools/swarm_client
 /tools/tryserver
 /tools/win/link_limiter/build
-/ui/resources/aura/google_wallpapers
 /ui/surface/surface.xml
 /ui/surface/surface_gpu_tests.xml
 /v8
diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc
index 14e5f70..267d962 100644
--- a/ash/desktop_background/desktop_background_controller.cc
+++ b/ash/desktop_background/desktop_background_controller.cc
@@ -240,8 +240,8 @@ bool DesktopBackgroundController::SetDefaultWallpaper(bool is_guest) {
   base::FilePath file_path;
   WallpaperLayout file_layout = use_large ? WALLPAPER_LAYOUT_CENTER_CROPPED :
       WALLPAPER_LAYOUT_CENTER;
-  int resource_id = use_large ? IDR_AURA_WALLPAPERS_5_GRADIENT5_LARGE :
-      IDR_AURA_WALLPAPERS_5_GRADIENT5_SMALL;
+  int resource_id = use_large ? IDR_AURA_WALLPAPER_DEFAULT_LARGE :
+      IDR_AURA_WALLPAPER_DEFAULT_SMALL;
   WallpaperLayout resource_layout = WALLPAPER_LAYOUT_TILE;
 
   const char* switch_name = is_guest ?
diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd
index 61c9c80..7640f65 100644
--- a/ash/resources/ash_resources.grd
+++ b/ash/resources/ash_resources.grd
@@ -12,8 +12,8 @@
   <release seq="1">
     <includes>
       <!-- Fallback wallpaper used by Ash. -->
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_LARGE" file="wallpapers/large/5-gradient5.jpg" type="BINDATA" />
-      <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_SMALL" file="wallpapers/small/5-gradient5.jpg" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPER_DEFAULT_LARGE" file="wallpaper/default_large.jpg" type="BINDATA" />
+      <include name="IDR_AURA_WALLPAPER_DEFAULT_SMALL" file="wallpaper/default_small.jpg" type="BINDATA" />
     </includes>
     <structures fallback_to_low_resolution="true">
       <!-- KEEP THESE IN ALPHABETICAL ORDER!  DO NOT ADD TO RANDOM PLACES JUST
diff --git a/ash/resources/wallpapers/large/5-gradient5.jpg b/ash/resources/wallpapers/large/5-gradient5.jpg
deleted file mode 100644
index 003f3f7..0000000
--- a/ash/resources/wallpapers/large/5-gradient5.jpg
+++ /dev/null
diff --git a/ash/resources/wallpapers/small/5-gradient5.jpg b/ash/resources/wallpapers/small/5-gradient5.jpg
deleted file mode 100644
index d8641f36..0000000
--- a/ash/resources/wallpapers/small/5-gradient5.jpg
+++ /dev/null
diff --git a/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc b/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
index ff25663..210aaa2 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
+++ b/chrome/browser/chromeos/login/wallpaper_manager_browsertest.cc
@@ -32,8 +32,8 @@ namespace chromeos {
 
 namespace {
 
-const int kLargeWallpaperResourceId = IDR_AURA_WALLPAPERS_5_GRADIENT5_LARGE;
-const int kSmallWallpaperResourceId = IDR_AURA_WALLPAPERS_5_GRADIENT5_SMALL;
+const int kLargeWallpaperResourceId = IDR_AURA_WALLPAPER_DEFAULT_LARGE;
+const int kSmallWallpaperResourceId = IDR_AURA_WALLPAPER_DEFAULT_SMALL;
 
 int kLargeWallpaperWidth = 256;
 int kLargeWallpaperHeight = ash::kLargeWallpaperMaxHeight;