| Index: ash/desktop_background/desktop_background_resources.cc
|
| diff --git a/ash/desktop_background/desktop_background_resources.cc b/ash/desktop_background/desktop_background_resources.cc
|
| index f53ac63fc4837c32b2c47b4cc9ccc68a2fb94906..5b7d07fb2aead40447dc17815c752472ddb336fe 100644
|
| --- a/ash/desktop_background/desktop_background_resources.cc
|
| +++ b/ash/desktop_background/desktop_background_resources.cc
|
| @@ -231,7 +231,10 @@ const int kInvalidWallpaperIndex = -1;
|
| const int kDefaultWallpaperIndex = 16; // IDR_AURA_WALLPAPERS_3_URBAN0
|
| const int kGuestWallpaperIndex = 26; // IDR_AURA_WALLPAPERS_5_GRADIENT6
|
| #else
|
| -const int kDefaultWallpaperIndex = 0;
|
| +// Set default wallpaper to the grey background for faster wallpaper loading
|
| +// time in browser tests. Otherwise, some of the tests will finish before
|
| +// wallpaper loaded and cause crashes.
|
| +const int kDefaultWallpaperIndex = 6; // IDR_AURA_WALLPAPERS_5_GRADIENT5
|
| const int kGuestWallpaperIndex = kDefaultWallpaperIndex;
|
| #endif
|
|
|
| @@ -257,13 +260,8 @@ int GetWallpaperCount() {
|
| return kDefaultWallpaperCount;
|
| }
|
|
|
| -const SkBitmap& GetWallpaper(int index) {
|
| - DCHECK(index >= 0 && index < kDefaultWallpaperCount);
|
| - return *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
|
| - kDefaultWallpapers[index].id).ToSkBitmap();
|
| -}
|
| -
|
| const WallpaperInfo& GetWallpaperInfo(int index) {
|
| + DCHECK(index >= 0 && index < kDefaultWallpaperCount);
|
| return kDefaultWallpapers[index];
|
| }
|
|
|
|
|