Revert r207560 and r207566 to reland r207511.

The win_aura builder appeared to have trouble running
animations in
DesktopBackgroundControllerTest.SetDefaultWallpaper; this
version of the change splits that test into several smaller
tests so that animations can be avoided.

Original change:

ash: Add flags for specifying default wallpaper.

This adds new command-line flags for specifying image files
that will be used as default wallpaper:

  --ash-default-guest-wallpaper-large
  --ash-default-guest-wallpaper-small
  --ash-default-wallpaper-large
  --ash-default-wallpaper-small

This makes it easier for Chrome OS to have per-device custom
wallpaper. (We previously loaded the default wallpaper from
a resource file, but that prevents the same build of Chrome
from being used on different devices.)

BUG=248764

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

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

1 files changed, 4 insertions, 0 deletions

diff --git a/ash/ash_switches.h b/ash/ash_switches.h
index f94a01f..23eacfc 100644
--- a/ash/ash_switches.h
+++ b/ash/ash_switches.h
@@ -21,6 +21,10 @@ ASH_EXPORT extern const char kAshAnimateFromBootSplashScreen[];
 ASH_EXPORT extern const char kAshConstrainPointerToRoot[];
 ASH_EXPORT extern const char kAshCopyHostBackgroundAtBoot[];
 ASH_EXPORT extern const char kAshDebugShortcuts[];
+ASH_EXPORT extern const char kAshDefaultGuestWallpaperLarge[];
+ASH_EXPORT extern const char kAshDefaultGuestWallpaperSmall[];
+ASH_EXPORT extern const char kAshDefaultWallpaperLarge[];
+ASH_EXPORT extern const char kAshDefaultWallpaperSmall[];
 ASH_EXPORT extern const char kAshDisableAutoMaximizing[];
 ASH_EXPORT extern const char kAshDisableAutoWindowPlacement[];
 ASH_EXPORT extern const char kAshDisableDisplayChangeLimiter[];