diff options
| -rw-r--r-- | ash/desktop_background/desktop_background_resources.cc | 552 | ||||
| -rw-r--r-- | ui/resources/ui_resources.grd | 214 |
2 files changed, 599 insertions, 167 deletions
diff --git a/ash/desktop_background/desktop_background_resources.cc b/ash/desktop_background/desktop_background_resources.cc index 5304fae..1eb7c49 100644 --- a/ash/desktop_background/desktop_background_resources.cc +++ b/ash/desktop_background/desktop_background_resources.cc @@ -14,7 +14,6 @@ namespace { const ash::WallpaperInfo kDefaultWallpapers[] = { -#if !defined(GOOGLE_CHROME_BUILD) { IDR_AURA_WALLPAPERS_ROMAINGUY_0, IDR_AURA_WALLPAPERS_ROMAINGUY_0_THUMB, @@ -22,204 +21,545 @@ const ash::WallpaperInfo kDefaultWallpapers[] = { "Romain Guy", "http://www.curious-creature.org" }, -#else { - IDR_AURA_WALLPAPERS_1_NATURE0, - IDR_AURA_WALLPAPERS_1_NATURE0_THUMB, + IDR_AURA_WALLPAPERS_WALLPAPER_0, + IDR_AURA_WALLPAPERS_WALLPAPER_0_THUMB, + ash::TILE, + "Test Gradient 0", + "http://www.chromium.org" + }, + { + IDR_AURA_WALLPAPERS_WALLPAPER_1, + IDR_AURA_WALLPAPERS_WALLPAPER_1_THUMB, + ash::TILE, + "Test Gradient 1", + "http://www.chromium.org" + }, + { + IDR_AURA_WALLPAPERS_WALLPAPER_2, + IDR_AURA_WALLPAPERS_WALLPAPER_2_THUMB, + ash::TILE, + "Test Gradient 2", + "http://www.chromium.org" + }, + { + IDR_AURA_WALLPAPERS_WALLPAPER_3, + IDR_AURA_WALLPAPERS_WALLPAPER_3_THUMB, + ash::TILE, + "Test Gradient 3", + "http://www.chromium.org" + }, + { + IDR_AURA_WALLPAPERS_WALLPAPER_4, + IDR_AURA_WALLPAPERS_WALLPAPER_4_THUMB, + ash::TILE, + "Test Gradient 4", + "http://www.chromium.org" + }, + { + IDR_AURA_WALLPAPERS_WALLPAPER_5, + IDR_AURA_WALLPAPERS_WALLPAPER_5_THUMB, + ash::TILE, + "Test Gradient 5", + "http://www.chromium.org" + }, + { + IDR_AURA_WALLPAPERS_WALLPAPER_6, + IDR_AURA_WALLPAPERS_WALLPAPER_6_THUMB, + ash::TILE, + "Test Gradient 6", + "http://www.chromium.org" + }, + { + IDR_AURA_WALLPAPERS_WALLPAPER_7, + IDR_AURA_WALLPAPERS_WALLPAPER_7_THUMB, + ash::TILE, + "Test Gradient 7", + "http://www.chromium.org" + }, + { + IDR_AURA_WALLPAPERS_WALLPAPER_8, + IDR_AURA_WALLPAPERS_WALLPAPER_8_THUMB, + ash::TILE, + "Test Gradient 8", + "http://www.chromium.org" + }, + { + IDR_AURA_WALLPAPERS_WALLPAPER_9, + IDR_AURA_WALLPAPERS_WALLPAPER_9_THUMB, + ash::TILE, + "Test Gradient 9", + "http://www.chromium.org" + }, + { + IDR_AURA_WALLPAPERS_WALLPAPER_10, + IDR_AURA_WALLPAPERS_WALLPAPER_10_THUMB, + ash::TILE, + "Test Gradient 10", + "http://www.chromium.org" + }, + { + IDR_AURA_WALLPAPERS_WALLPAPER_11, + IDR_AURA_WALLPAPERS_WALLPAPER_11_THUMB, + ash::TILE, + "Test Gradient 11", + "http://www.chromium.org" + }, + { + IDR_AURA_WALLPAPERS_WALLPAPER_12, + IDR_AURA_WALLPAPERS_WALLPAPER_12_THUMB, + ash::TILE, + "Test Gradient 12", + "http://www.chromium.org" + }, +#if defined(GOOGLE_CHROME_BUILD) + { + IDR_AURA_WALLPAPERS_CHARLESDAVEY_0, + IDR_AURA_WALLPAPERS_CHARLESDAVEY_0_THUMB, ash::CENTER_CROPPED, - "Romain Guy", - "http://www.curious-creature.org" + "Charles Davey", + "http://500px.com/CharlesDavey" }, { - IDR_AURA_WALLPAPERS_1_NATURE1, - IDR_AURA_WALLPAPERS_1_NATURE1_THUMB, + IDR_AURA_WALLPAPERS_JOHANNESVANDONGE_0, + IDR_AURA_WALLPAPERS_JOHANNESVANDONGE_0_THUMB, ash::CENTER_CROPPED, "Johannes van Donge", "http://www.diginature.nl" }, { - IDR_AURA_WALLPAPERS_1_NATURE2, - IDR_AURA_WALLPAPERS_1_NATURE2_THUMB, + IDR_AURA_WALLPAPERS_JOHANNESVANDONGE_1, + IDR_AURA_WALLPAPERS_JOHANNESVANDONGE_1_THUMB, ash::CENTER_CROPPED, - "Oleg Zhukov", - "http://500px.com/eosboy" + "Johannes van Donge", + "http://www.diginature.nl" }, { - IDR_AURA_WALLPAPERS_1_NATURE3, - IDR_AURA_WALLPAPERS_1_NATURE3_THUMB, + IDR_AURA_WALLPAPERS_JOHANNESVANDONGE_2, + IDR_AURA_WALLPAPERS_JOHANNESVANDONGE_2_THUMB, ash::CENTER_CROPPED, - "Stefano Ronchi", - "http://www.stefanoronchi.com" + "Johannes van Donge", + "http://www.diginature.nl" }, { - IDR_AURA_WALLPAPERS_1_NATURE4, - IDR_AURA_WALLPAPERS_1_NATURE4_THUMB, + IDR_AURA_WALLPAPERS_MARIOMORENO_0, + IDR_AURA_WALLPAPERS_MARIOMORENO_0_THUMB, ash::CENTER_CROPPED, - "Stefano Ronchi", - "http://www.stefanoronchi.com" + "Mario Moreno", + "http://www.mariomorenophotography.com" }, { - IDR_AURA_WALLPAPERS_1_NATURE5, - IDR_AURA_WALLPAPERS_1_NATURE5_THUMB, + IDR_AURA_WALLPAPERS_MARIOMORENO_1, + IDR_AURA_WALLPAPERS_MARIOMORENO_1_THUMB, ash::CENTER_CROPPED, "Mario Moreno", "http://www.mariomorenophotography.com" }, { - IDR_AURA_WALLPAPERS_1_NATURE6, - IDR_AURA_WALLPAPERS_1_NATURE6_THUMB, + IDR_AURA_WALLPAPERS_MARIOMORENO_2, + IDR_AURA_WALLPAPERS_MARIOMORENO_2_THUMB, ash::CENTER_CROPPED, - "Walter Soestbergen", - "http://www.waltersoestbergen.nl" + "Mario Moreno", + "http://www.mariomorenophotography.com" + }, + { + IDR_AURA_WALLPAPERS_MARIOMORENO_3, + IDR_AURA_WALLPAPERS_MARIOMORENO_3_THUMB, + ash::CENTER_CROPPED, + "Mario Moreno", + "http://www.mariomorenophotography.com" + }, + { + IDR_AURA_WALLPAPERS_MARIOMORENO_4, + IDR_AURA_WALLPAPERS_MARIOMORENO_4_THUMB, + ash::CENTER_CROPPED, + "Mario Moreno", + "http://www.mariomorenophotography.com" + }, + { + IDR_AURA_WALLPAPERS_MARIOMORENO_5, + IDR_AURA_WALLPAPERS_MARIOMORENO_5_THUMB, + ash::CENTER_CROPPED, + "Mario Moreno", + "http://www.mariomorenophotography.com" }, { - IDR_AURA_WALLPAPERS_1_NATURE7, - IDR_AURA_WALLPAPERS_1_NATURE7_THUMB, + IDR_AURA_WALLPAPERS_MARIOMORENO_6, + IDR_AURA_WALLPAPERS_MARIOMORENO_6_THUMB, + ash::CENTER_CROPPED, + "Mario Moreno", + "http://www.mariomorenophotography.com" + }, + { + IDR_AURA_WALLPAPERS_MARIOMORENO_7, + IDR_AURA_WALLPAPERS_MARIOMORENO_7_THUMB, + ash::CENTER_CROPPED, + "Mario Moreno", + "http://www.mariomorenophotography.com" + }, + { + IDR_AURA_WALLPAPERS_MARIOMORENO_8, + IDR_AURA_WALLPAPERS_MARIOMORENO_8_THUMB, + ash::CENTER_CROPPED, + "Mario Moreno", + "http://www.mariomorenophotography.com" + }, + { + IDR_AURA_WALLPAPERS_MARKBRIDGER_0, + IDR_AURA_WALLPAPERS_MARKBRIDGER_0_THUMB, ash::CENTER_CROPPED, "Mark Bridger", "http://www.bridgephotography.co.uk" }, { - IDR_AURA_WALLPAPERS_2_LANDSCAPE0, - IDR_AURA_WALLPAPERS_2_LANDSCAPE0_THUMB, + IDR_AURA_WALLPAPERS_MARKBRIDGER_1, + IDR_AURA_WALLPAPERS_MARKBRIDGER_1_THUMB, ash::CENTER_CROPPED, - "Vitali Prokopenko", - "http://www.vitphoto.com/" + "Mark Bridger", + "http://www.bridgephotography.co.uk" }, { - IDR_AURA_WALLPAPERS_2_LANDSCAPE1, - IDR_AURA_WALLPAPERS_2_LANDSCAPE1_THUMB, + IDR_AURA_WALLPAPERS_MARKBRIDGER_2, + IDR_AURA_WALLPAPERS_MARKBRIDGER_2_THUMB, ash::CENTER_CROPPED, - "Romain Guy", - "http://www.curious-creature.org" + "Mark Bridger", + "http://www.bridgephotography.co.uk" }, { - IDR_AURA_WALLPAPERS_2_LANDSCAPE2, - IDR_AURA_WALLPAPERS_2_LANDSCAPE2_THUMB, + IDR_AURA_WALLPAPERS_MARKBRIDGER_3, + IDR_AURA_WALLPAPERS_MARKBRIDGER_3_THUMB, ash::CENTER_CROPPED, "Mark Bridger", "http://www.bridgephotography.co.uk" }, { - IDR_AURA_WALLPAPERS_2_LANDSCAPE3, - IDR_AURA_WALLPAPERS_2_LANDSCAPE3_THUMB, + IDR_AURA_WALLPAPERS_MARKBRIDGER_4, + IDR_AURA_WALLPAPERS_MARKBRIDGER_4_THUMB, + ash::CENTER_CROPPED, + "Mark Bridger", + "http://www.bridgephotography.co.uk" + }, + { + IDR_AURA_WALLPAPERS_MARKBRIDGER_5, + IDR_AURA_WALLPAPERS_MARKBRIDGER_5_THUMB, + ash::CENTER_CROPPED, + "Mark Bridger", + "http://www.bridgephotography.co.uk" + }, + { + IDR_AURA_WALLPAPERS_MARKBRIDGER_6, + IDR_AURA_WALLPAPERS_MARKBRIDGER_6_THUMB, + ash::CENTER_CROPPED, + "Mark Bridger", + "http://www.bridgephotography.co.uk" + }, + { + IDR_AURA_WALLPAPERS_MICHELBRICTEUX_0, + IDR_AURA_WALLPAPERS_MICHELBRICTEUX_0_THUMB, + ash::CENTER_CROPPED, + "Michel Bricteux", + "http://500px.com/mbricteux" + }, + { + IDR_AURA_WALLPAPERS_MICHELBRICTEUX_1, + IDR_AURA_WALLPAPERS_MICHELBRICTEUX_1_THUMB, + ash::CENTER_CROPPED, + "Michel Bricteux", + "http://500px.com/mbricteux" + }, + { + IDR_AURA_WALLPAPERS_MICHELBRICTEUX_2, + IDR_AURA_WALLPAPERS_MICHELBRICTEUX_2_THUMB, + ash::CENTER_CROPPED, + "Michel Bricteux", + "http://500px.com/mbricteux" + }, + { + IDR_AURA_WALLPAPERS_MICHELBRICTEUX_3, + IDR_AURA_WALLPAPERS_MICHELBRICTEUX_3_THUMB, + ash::CENTER_CROPPED, + "Michel Bricteux", + "http://500px.com/mbricteux" + }, + { + IDR_AURA_WALLPAPERS_MIKEREYFMAN_0, + IDR_AURA_WALLPAPERS_MIKEREYFMAN_0_THUMB, ash::CENTER_CROPPED, "Mike Reyfman", "http://mikereyfman.com" }, { - IDR_AURA_WALLPAPERS_2_LANDSCAPE4, - IDR_AURA_WALLPAPERS_2_LANDSCAPE4_THUMB, + IDR_AURA_WALLPAPERS_MIKEREYFMAN_1, + IDR_AURA_WALLPAPERS_MIKEREYFMAN_1_THUMB, ash::CENTER_CROPPED, "Mike Reyfman", "http://mikereyfman.com" }, { - IDR_AURA_WALLPAPERS_2_LANDSCAPE5, - IDR_AURA_WALLPAPERS_2_LANDSCAPE5_THUMB, + IDR_AURA_WALLPAPERS_MIKEREYFMAN_2, + IDR_AURA_WALLPAPERS_MIKEREYFMAN_2_THUMB, ash::CENTER_CROPPED, "Mike Reyfman", "http://mikereyfman.com" }, { - IDR_AURA_WALLPAPERS_2_LANDSCAPE6, - IDR_AURA_WALLPAPERS_2_LANDSCAPE6_THUMB, + IDR_AURA_WALLPAPERS_MIKEREYFMAN_3, + IDR_AURA_WALLPAPERS_MIKEREYFMAN_3_THUMB, ash::CENTER_CROPPED, "Mike Reyfman", "http://mikereyfman.com" }, { - IDR_AURA_WALLPAPERS_2_LANDSCAPE7, - IDR_AURA_WALLPAPERS_2_LANDSCAPE7_THUMB, + IDR_AURA_WALLPAPERS_MIKEREYFMAN_4, + IDR_AURA_WALLPAPERS_MIKEREYFMAN_4_THUMB, ash::CENTER_CROPPED, - "Romain Guy", - "http://www.curious-creature.org" + "Mike Reyfman", + "http://mikereyfman.com" }, { - IDR_AURA_WALLPAPERS_3_URBAN0, - IDR_AURA_WALLPAPERS_3_URBAN0_THUMB, + IDR_AURA_WALLPAPERS_MIKEREYFMAN_5, + IDR_AURA_WALLPAPERS_MIKEREYFMAN_5_THUMB, ash::CENTER_CROPPED, - "Paulo FLOP", - "http://500px.com/FLOP" + "Mike Reyfman", + "http://mikereyfman.com" }, { - IDR_AURA_WALLPAPERS_3_URBAN1, - IDR_AURA_WALLPAPERS_3_URBAN1_THUMB, + IDR_AURA_WALLPAPERS_MIKEREYFMAN_6, + IDR_AURA_WALLPAPERS_MIKEREYFMAN_6_THUMB, ash::CENTER_CROPPED, "Mike Reyfman", "http://mikereyfman.com" }, { - IDR_AURA_WALLPAPERS_3_URBAN2, - IDR_AURA_WALLPAPERS_3_URBAN2_THUMB, + IDR_AURA_WALLPAPERS_NEILKREMER_0, + IDR_AURA_WALLPAPERS_NEILKREMER_0_THUMB, ash::CENTER_CROPPED, "Neil Kremer", "http://lightshedimagery.smugmug.com" }, { - IDR_AURA_WALLPAPERS_3_URBAN3, - IDR_AURA_WALLPAPERS_3_URBAN3_THUMB, + IDR_AURA_WALLPAPERS_NEILKREMER_1, + IDR_AURA_WALLPAPERS_NEILKREMER_1_THUMB, ash::CENTER_CROPPED, "Neil Kremer", "http://lightshedimagery.smugmug.com" }, -#endif { - IDR_AURA_WALLPAPERS_5_GRADIENT0, - IDR_AURA_WALLPAPERS_5_GRADIENT0_THUMB, - ash::TILE, - "Chromium", - "http://www.chromium.org" + IDR_AURA_WALLPAPERS_NEILKREMER_2, + IDR_AURA_WALLPAPERS_NEILKREMER_2_THUMB, + ash::CENTER_CROPPED, + "Neil Kremer", + "http://lightshedimagery.smugmug.com" }, { - IDR_AURA_WALLPAPERS_5_GRADIENT1, - IDR_AURA_WALLPAPERS_5_GRADIENT1_THUMB, - ash::TILE, - "Chromium", - "http://www.chromium.org" + IDR_AURA_WALLPAPERS_OLEGZHUKOV_0, + IDR_AURA_WALLPAPERS_OLEGZHUKOV_0_THUMB, + ash::CENTER_CROPPED, + "Oleg Zhukov", + "http://500px.com/eosboy" }, { - IDR_AURA_WALLPAPERS_5_GRADIENT2, - IDR_AURA_WALLPAPERS_5_GRADIENT2_THUMB, - ash::TILE, - "Chromium", - "http://www.chromium.org" + IDR_AURA_WALLPAPERS_OLEGZHUKOV_1, + IDR_AURA_WALLPAPERS_OLEGZHUKOV_1_THUMB, + ash::CENTER_CROPPED, + "Oleg Zhukov", + "http://500px.com/eosboy" }, { - IDR_AURA_WALLPAPERS_5_GRADIENT3, - IDR_AURA_WALLPAPERS_5_GRADIENT3_THUMB, - ash::TILE, - "Chromium", - "http://www.chromium.org" + IDR_AURA_WALLPAPERS_PAULOFLOP_0, + IDR_AURA_WALLPAPERS_PAULOFLOP_0_THUMB, + ash::CENTER_CROPPED, + "Paulo FLOP", + "http://500px.com/FLOP" }, { - IDR_AURA_WALLPAPERS_5_GRADIENT4, - IDR_AURA_WALLPAPERS_5_GRADIENT4_THUMB, - ash::TILE, - "Chromium", - "http://www.chromium.org" + IDR_AURA_WALLPAPERS_PAULOFLOP_1, + IDR_AURA_WALLPAPERS_PAULOFLOP_1_THUMB, + ash::CENTER_CROPPED, + "Paulo FLOP", + "http://500px.com/FLOP" }, { - IDR_AURA_WALLPAPERS_5_GRADIENT5, - IDR_AURA_WALLPAPERS_5_GRADIENT5_THUMB, - ash::TILE, - "Chromium", - "http://www.chromium.org" + IDR_AURA_WALLPAPERS_PAULOFLOP_2, + IDR_AURA_WALLPAPERS_PAULOFLOP_2_THUMB, + ash::CENTER_CROPPED, + "Paulo FLOP", + "http://500px.com/FLOP" }, { - IDR_AURA_WALLPAPERS_5_GRADIENT6, - IDR_AURA_WALLPAPERS_5_GRADIENT6_THUMB, - ash::TILE, - "Chromium", - "http://www.chromium.org" + IDR_AURA_WALLPAPERS_PAULOFLOP_3, + IDR_AURA_WALLPAPERS_PAULOFLOP_3_THUMB, + ash::CENTER_CROPPED, + "Paulo FLOP", + "http://500px.com/FLOP" }, { - IDR_AURA_WALLPAPERS_5_GRADIENT7, - IDR_AURA_WALLPAPERS_5_GRADIENT7_THUMB, - ash::TILE, - "Chromium", - "http://www.chromium.org" + IDR_AURA_WALLPAPERS_PAULOFLOP_4, + IDR_AURA_WALLPAPERS_PAULOFLOP_4_THUMB, + ash::CENTER_CROPPED, + "Paulo FLOP", + "http://500px.com/FLOP" + }, + { + IDR_AURA_WALLPAPERS_PAULOFLOP_5, + IDR_AURA_WALLPAPERS_PAULOFLOP_5_THUMB, + ash::CENTER_CROPPED, + "Paulo FLOP", + "http://500px.com/FLOP" + }, + { + IDR_AURA_WALLPAPERS_STEFANORONCHI_0, + IDR_AURA_WALLPAPERS_STEFANORONCHI_0_THUMB, + ash::CENTER_CROPPED, + "Stefano Ronchi", + "http://www.stefanoronchi.com" + }, + { + IDR_AURA_WALLPAPERS_STEFANORONCHI_1, + IDR_AURA_WALLPAPERS_STEFANORONCHI_1_THUMB, + ash::CENTER_CROPPED, + "Stefano Ronchi", + "http://www.stefanoronchi.com" + }, + { + IDR_AURA_WALLPAPERS_STEFANORONCHI_2, + IDR_AURA_WALLPAPERS_STEFANORONCHI_2_THUMB, + ash::CENTER_CROPPED, + "Stefano Ronchi", + "http://www.stefanoronchi.com" + }, + { + IDR_AURA_WALLPAPERS_STEFANORONCHI_3, + IDR_AURA_WALLPAPERS_STEFANORONCHI_3_THUMB, + ash::CENTER_CROPPED, + "Stefano Ronchi", + "http://www.stefanoronchi.com" + }, + { + IDR_AURA_WALLPAPERS_VITALIPROKOPENKO_0, + IDR_AURA_WALLPAPERS_VITALIPROKOPENKO_0_THUMB, + ash::CENTER_CROPPED, + "Vitali Prokopenko", + "http://www.vitphoto.com" + }, + { + IDR_AURA_WALLPAPERS_VITALIPROKOPENKO_1, + IDR_AURA_WALLPAPERS_VITALIPROKOPENKO_1_THUMB, + ash::CENTER_CROPPED, + "Vitali Prokopenko", + "http://www.vitphoto.com" + }, + { + IDR_AURA_WALLPAPERS_VITALIPROKOPENKO_2, + IDR_AURA_WALLPAPERS_VITALIPROKOPENKO_2_THUMB, + ash::CENTER_CROPPED, + "Vitali Prokopenko", + "http://www.vitphoto.com" + }, + { + IDR_AURA_WALLPAPERS_WALTERSOESTBERGEN_0, + IDR_AURA_WALLPAPERS_WALTERSOESTBERGEN_0_THUMB, + ash::CENTER_CROPPED, + "Walter Soestbergen", + "http://www.waltersoestbergen.nl" + }, + { + IDR_AURA_WALLPAPERS_BEACH_DAY, + IDR_AURA_WALLPAPERS_BEACH_DAY_THUMB, + // TODO(saintlou): change to ash::CENTER once final assets are added. + ash::STRETCH, + "Test", + "http://www.chromium.org", + }, + { + IDR_AURA_WALLPAPERS_BEACH_NIGHT, + IDR_AURA_WALLPAPERS_BEACH_NIGHT_THUMB, + // TODO(saintlou): change to ash::CENTER once final assets are added. + ash::STRETCH, + "Test", + "http://www.chromium.org", + }, + { + IDR_AURA_WALLPAPERS_FOREST_DAY, + IDR_AURA_WALLPAPERS_FOREST_DAY_THUMB, + // TODO(saintlou): change to ash::CENTER once final assets are added. + ash::STRETCH, + "Test", + "http://www.chromium.org", + }, + { + IDR_AURA_WALLPAPERS_FOREST_NIGHT, + IDR_AURA_WALLPAPERS_FOREST_NIGHT_THUMB, + // TODO(saintlou): change to ash::CENTER once final assets are added. + ash::STRETCH, + "Test", + "http://www.chromium.org", + }, + { + IDR_AURA_WALLPAPERS_MOUNTAIN_DAY, + IDR_AURA_WALLPAPERS_MOUNTAIN_DAY_THUMB, + // TODO(saintlou): change to ash::CENTER once final assets are added. + ash::STRETCH, + "Test", + "http://www.chromium.org", + }, + { + IDR_AURA_WALLPAPERS_MOUNTAIN_NIGHT, + IDR_AURA_WALLPAPERS_MOUNTAIN_NIGHT_THUMB, + // TODO(saintlou): change to ash::CENTER once final assets are added. + ash::STRETCH, + "Test", + "http://www.chromium.org", + }, + { + IDR_AURA_WALLPAPERS_NYC_DAY, + IDR_AURA_WALLPAPERS_NYC_DAY_THUMB, + // TODO(saintlou): change to ash::CENTER once final assets are added. + ash::STRETCH, + "Test", + "http://www.chromium.org", + }, + { + IDR_AURA_WALLPAPERS_NYC_NIGHT, + IDR_AURA_WALLPAPERS_NYC_NIGHT_THUMB, + // TODO(saintlou): change to ash::CENTER once final assets are added. + ash::STRETCH, + "Test", + "http://www.chromium.org", + }, + { + IDR_AURA_WALLPAPERS_PLAINS_DAY, + IDR_AURA_WALLPAPERS_PLAINS_DAY_THUMB, + // TODO(saintlou): change to ash::CENTER once final assets are added. + ash::STRETCH, + "Test", + "http://www.chromium.org", + }, + { + IDR_AURA_WALLPAPERS_PLAINS_NIGHT, + IDR_AURA_WALLPAPERS_PLAINS_NIGHT_THUMB, + // TODO(saintlou): change to ash::CENTER once final assets are added. + ash::STRETCH, + "Test", + "http://www.chromium.org", + }, + { + IDR_AURA_WALLPAPERS_SF_DAY, + IDR_AURA_WALLPAPERS_SF_DAY_THUMB, + // TODO(saintlou): change to ash::CENTER once final assets are added. + ash::STRETCH, + "Test", + "http://www.chromium.org", + }, + { + IDR_AURA_WALLPAPERS_SF_NIGHT, + IDR_AURA_WALLPAPERS_SF_NIGHT_THUMB, + // TODO(saintlou): change to ash::CENTER once final assets are added. + ash::STRETCH, + "Test", + "http://www.chromium.org", }, +#endif // GOOGLE_CHROME_BUILD }; const int kDefaultWallpaperCount = arraysize(kDefaultWallpapers); @@ -227,11 +567,11 @@ const int kDefaultWallpaperCount = arraysize(kDefaultWallpapers); // TODO(saintlou): These hardcoded indexes, although checked against the size // of the array are really hacky. #if defined(GOOGLE_CHROME_BUILD) -const int kLastRandomWallpaperIndex = 19; // The first 20 are random. -const int kGuestWallpaperIndex = 26; // IDR_AURA_WALLPAPERS_5_GRADIENT6 +const int kLastRandomWallpaperIndex = 12; +const int kIcognitoWallpaperIndex = 0; #else const int kDefaultWallpaperIndex = 0; -const int kGuestWallpaperIndex = kDefaultWallpaperIndex; +const int kIcognitoWallpaperIndex = kDefaultWallpaperIndex; #endif } // namespace @@ -249,8 +589,8 @@ int GetDefaultWallpaperIndex() { } int GetGuestWallpaperIndex() { - DCHECK(kGuestWallpaperIndex < kDefaultWallpaperCount); - return std::min(kGuestWallpaperIndex, kDefaultWallpaperCount - 1); + DCHECK(kIcognitoWallpaperIndex < kDefaultWallpaperCount); + return std::min(kIcognitoWallpaperIndex, kDefaultWallpaperCount - 1); } int GetWallpaperCount() { diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd index a32e533..8964287 100644 --- a/ui/resources/ui_resources.grd +++ b/ui/resources/ui_resources.grd @@ -168,74 +168,166 @@ <include name="IDR_AURA_STATUS_MOCK" file="aura/statusbar.png" type="BINDATA" /> </if> - <!-- Wallpapers used by Ash when building ChromiumOS. --> - <if expr="pp_ifdef('use_ash') and not pp_ifdef('_google_chrome')"> + <!-- Wallpapers used by Ash. --> + <if expr="pp_ifdef('use_ash')"> <include name="IDR_AURA_WALLPAPERS_ROMAINGUY_0" file="aura/wallpapers/romainguy_0.jpg" type="BINDATA" /> <include name="IDR_AURA_WALLPAPERS_ROMAINGUY_0_THUMB" file="aura/wallpapers/romainguy_0_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_0" file="aura/wallpapers/wallpaper_0.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_0_THUMB" file="aura/wallpapers/wallpaper_0_thumb.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_1" file="aura/wallpapers/wallpaper_1.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_1_THUMB" file="aura/wallpapers/wallpaper_1_thumb.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_2" file="aura/wallpapers/wallpaper_2.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_2_THUMB" file="aura/wallpapers/wallpaper_2_thumb.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_3" file="aura/wallpapers/wallpaper_3.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_3_THUMB" file="aura/wallpapers/wallpaper_3_thumb.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_4" file="aura/wallpapers/wallpaper_4.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_4_THUMB" file="aura/wallpapers/wallpaper_4_thumb.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_5" file="aura/wallpapers/wallpaper_5.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_5_THUMB" file="aura/wallpapers/wallpaper_5_thumb.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_6" file="aura/wallpapers/wallpaper_6.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_6_THUMB" file="aura/wallpapers/wallpaper_6_thumb.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_7" file="aura/wallpapers/wallpaper_7.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_7_THUMB" file="aura/wallpapers/wallpaper_7_thumb.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_8" file="aura/wallpapers/wallpaper_8.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_8_THUMB" file="aura/wallpapers/wallpaper_8_thumb.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_9" file="aura/wallpapers/wallpaper_9.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_9_THUMB" file="aura/wallpapers/wallpaper_9_thumb.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_10" file="aura/wallpapers/wallpaper_10.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_10_THUMB" file="aura/wallpapers/wallpaper_10_thumb.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_11" file="aura/wallpapers/wallpaper_11.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_11_THUMB" file="aura/wallpapers/wallpaper_11_thumb.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_12" file="aura/wallpapers/wallpaper_12.png" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALLPAPER_12_THUMB" file="aura/wallpapers/wallpaper_12_thumb.png" type="BINDATA" /> </if> <!-- Wallpapers available to Ash when building Official ChromeOS. --> <if expr="pp_ifdef('use_ash') and pp_ifdef('_google_chrome')"> - <include name="IDR_AURA_WALLPAPERS_1_NATURE0" file="aura/google_wallpapers/1-nature0.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE0_THUMB" file="aura/google_wallpapers/1-nature0_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE1" file="aura/google_wallpapers/1-nature1.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE1_THUMB" file="aura/google_wallpapers/1-nature1_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE2" file="aura/google_wallpapers/1-nature2.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE2_THUMB" file="aura/google_wallpapers/1-nature2_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE3" file="aura/google_wallpapers/1-nature3.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE3_THUMB" file="aura/google_wallpapers/1-nature3_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE4" file="aura/google_wallpapers/1-nature4.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE4_THUMB" file="aura/google_wallpapers/1-nature4_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE5" file="aura/google_wallpapers/1-nature5.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE5_THUMB" file="aura/google_wallpapers/1-nature5_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE6" file="aura/google_wallpapers/1-nature6.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE6_THUMB" file="aura/google_wallpapers/1-nature6_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE7" file="aura/google_wallpapers/1-nature7.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_1_NATURE7_THUMB" file="aura/google_wallpapers/1-nature7_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE0" file="aura/google_wallpapers/2-landscape0.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE0_THUMB" file="aura/google_wallpapers/2-landscape0_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE1" file="aura/google_wallpapers/2-landscape1.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE1_THUMB" file="aura/google_wallpapers/2-landscape1_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE2" file="aura/google_wallpapers/2-landscape2.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE2_THUMB" file="aura/google_wallpapers/2-landscape2_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE3" file="aura/google_wallpapers/2-landscape3.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE3_THUMB" file="aura/google_wallpapers/2-landscape3_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE4" file="aura/google_wallpapers/2-landscape4.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE4_THUMB" file="aura/google_wallpapers/2-landscape4_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE5" file="aura/google_wallpapers/2-landscape5.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE5_THUMB" file="aura/google_wallpapers/2-landscape5_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE6" file="aura/google_wallpapers/2-landscape6.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE6_THUMB" file="aura/google_wallpapers/2-landscape6_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7" file="aura/google_wallpapers/2-landscape7.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_2_LANDSCAPE7_THUMB" file="aura/google_wallpapers/2-landscape7_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_3_URBAN0" file="aura/google_wallpapers/3-urban0.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_3_URBAN0_THUMB" file="aura/google_wallpapers/3-urban0_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_3_URBAN1" file="aura/google_wallpapers/3-urban1.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_3_URBAN1_THUMB" file="aura/google_wallpapers/3-urban1_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_3_URBAN2" file="aura/google_wallpapers/3-urban2.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_3_URBAN2_THUMB" file="aura/google_wallpapers/3-urban2_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_3_URBAN3" file="aura/google_wallpapers/3-urban3.jpg" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_3_URBAN3_THUMB" file="aura/google_wallpapers/3-urban3_thumb.png" type="BINDATA" /> - </if> + <include name="IDR_AURA_WALLPAPERS_CHARLESDAVEY_0" file="aura/google_wallpapers/charlesdavey_0.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_CHARLESDAVEY_0_THUMB" file="aura/google_wallpapers/charlesdavey_0_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_JOHANNESVANDONGE_0" file="aura/google_wallpapers/johannesvandonge_0.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_JOHANNESVANDONGE_0_THUMB" file="aura/google_wallpapers/johannesvandonge_0_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_JOHANNESVANDONGE_1" file="aura/google_wallpapers/johannesvandonge_1.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_JOHANNESVANDONGE_1_THUMB" file="aura/google_wallpapers/johannesvandonge_1_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_JOHANNESVANDONGE_2" file="aura/google_wallpapers/johannesvandonge_2.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_JOHANNESVANDONGE_2_THUMB" file="aura/google_wallpapers/johannesvandonge_2_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARIOMORENO_0" file="aura/google_wallpapers/mariomoreno_0.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARIOMORENO_0_THUMB" file="aura/google_wallpapers/mariomoreno_0_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARIOMORENO_1" file="aura/google_wallpapers/mariomoreno_1.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARIOMORENO_1_THUMB" file="aura/google_wallpapers/mariomoreno_1_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARIOMORENO_2" file="aura/google_wallpapers/mariomoreno_2.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARIOMORENO_2_THUMB" file="aura/google_wallpapers/mariomoreno_2_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARIOMORENO_3" file="aura/google_wallpapers/mariomoreno_3.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARIOMORENO_3_THUMB" file="aura/google_wallpapers/mariomoreno_3_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARIOMORENO_4" file="aura/google_wallpapers/mariomoreno_4.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARIOMORENO_4_THUMB" file="aura/google_wallpapers/mariomoreno_4_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARIOMORENO_5" file="aura/google_wallpapers/mariomoreno_5.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARIOMORENO_5_THUMB" file="aura/google_wallpapers/mariomoreno_5_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARIOMORENO_6" file="aura/google_wallpapers/mariomoreno_6.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARIOMORENO_6_THUMB" file="aura/google_wallpapers/mariomoreno_6_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARIOMORENO_7" file="aura/google_wallpapers/mariomoreno_7.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARIOMORENO_7_THUMB" file="aura/google_wallpapers/mariomoreno_7_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARIOMORENO_8" file="aura/google_wallpapers/mariomoreno_8.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARIOMORENO_8_THUMB" file="aura/google_wallpapers/mariomoreno_8_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARKBRIDGER_0" file="aura/google_wallpapers/markbridger_0.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARKBRIDGER_0_THUMB" file="aura/google_wallpapers/markbridger_0_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARKBRIDGER_1" file="aura/google_wallpapers/markbridger_1.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARKBRIDGER_1_THUMB" file="aura/google_wallpapers/markbridger_1_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARKBRIDGER_2" file="aura/google_wallpapers/markbridger_2.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARKBRIDGER_2_THUMB" file="aura/google_wallpapers/markbridger_2_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARKBRIDGER_3" file="aura/google_wallpapers/markbridger_3.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARKBRIDGER_3_THUMB" file="aura/google_wallpapers/markbridger_3_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARKBRIDGER_4" file="aura/google_wallpapers/markbridger_4.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARKBRIDGER_4_THUMB" file="aura/google_wallpapers/markbridger_4_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARKBRIDGER_5" file="aura/google_wallpapers/markbridger_5.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARKBRIDGER_5_THUMB" file="aura/google_wallpapers/markbridger_5_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARKBRIDGER_6" file="aura/google_wallpapers/markbridger_6.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MARKBRIDGER_6_THUMB" file="aura/google_wallpapers/markbridger_6_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MICHELBRICTEUX_0" file="aura/google_wallpapers/michelbricteux_0.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MICHELBRICTEUX_0_THUMB" file="aura/google_wallpapers/michelbricteux_0_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MICHELBRICTEUX_1" file="aura/google_wallpapers/michelbricteux_1.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MICHELBRICTEUX_1_THUMB" file="aura/google_wallpapers/michelbricteux_1_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MICHELBRICTEUX_2" file="aura/google_wallpapers/michelbricteux_2.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MICHELBRICTEUX_2_THUMB" file="aura/google_wallpapers/michelbricteux_2_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MICHELBRICTEUX_3" file="aura/google_wallpapers/michelbricteux_3.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MICHELBRICTEUX_3_THUMB" file="aura/google_wallpapers/michelbricteux_3_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MIKEREYFMAN_0" file="aura/google_wallpapers/mikereyfman_0.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MIKEREYFMAN_0_THUMB" file="aura/google_wallpapers/mikereyfman_0_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MIKEREYFMAN_1" file="aura/google_wallpapers/mikereyfman_1.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MIKEREYFMAN_1_THUMB" file="aura/google_wallpapers/mikereyfman_1_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MIKEREYFMAN_2" file="aura/google_wallpapers/mikereyfman_2.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MIKEREYFMAN_2_THUMB" file="aura/google_wallpapers/mikereyfman_2_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MIKEREYFMAN_3" file="aura/google_wallpapers/mikereyfman_3.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MIKEREYFMAN_3_THUMB" file="aura/google_wallpapers/mikereyfman_3_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MIKEREYFMAN_4" file="aura/google_wallpapers/mikereyfman_4.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MIKEREYFMAN_4_THUMB" file="aura/google_wallpapers/mikereyfman_4_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MIKEREYFMAN_5" file="aura/google_wallpapers/mikereyfman_5.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MIKEREYFMAN_5_THUMB" file="aura/google_wallpapers/mikereyfman_5_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MIKEREYFMAN_6" file="aura/google_wallpapers/mikereyfman_6.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MIKEREYFMAN_6_THUMB" file="aura/google_wallpapers/mikereyfman_6_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_NEILKREMER_0" file="aura/google_wallpapers/neilkremer_0.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_NEILKREMER_0_THUMB" file="aura/google_wallpapers/neilkremer_0_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_NEILKREMER_1" file="aura/google_wallpapers/neilkremer_1.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_NEILKREMER_1_THUMB" file="aura/google_wallpapers/neilkremer_1_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_NEILKREMER_2" file="aura/google_wallpapers/neilkremer_2.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_NEILKREMER_2_THUMB" file="aura/google_wallpapers/neilkremer_2_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_OLEGZHUKOV_0" file="aura/google_wallpapers/olegzhukov_0.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_OLEGZHUKOV_0_THUMB" file="aura/google_wallpapers/olegzhukov_0_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_OLEGZHUKOV_1" file="aura/google_wallpapers/olegzhukov_1.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_OLEGZHUKOV_1_THUMB" file="aura/google_wallpapers/olegzhukov_1_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_PAULOFLOP_0" file="aura/google_wallpapers/pauloflop_0.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_PAULOFLOP_0_THUMB" file="aura/google_wallpapers/pauloflop_0_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_PAULOFLOP_1" file="aura/google_wallpapers/pauloflop_1.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_PAULOFLOP_1_THUMB" file="aura/google_wallpapers/pauloflop_1_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_PAULOFLOP_2" file="aura/google_wallpapers/pauloflop_2.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_PAULOFLOP_2_THUMB" file="aura/google_wallpapers/pauloflop_2_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_PAULOFLOP_3" file="aura/google_wallpapers/pauloflop_3.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_PAULOFLOP_3_THUMB" file="aura/google_wallpapers/pauloflop_3_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_PAULOFLOP_4" file="aura/google_wallpapers/pauloflop_4.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_PAULOFLOP_4_THUMB" file="aura/google_wallpapers/pauloflop_4_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_PAULOFLOP_5" file="aura/google_wallpapers/pauloflop_5.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_PAULOFLOP_5_THUMB" file="aura/google_wallpapers/pauloflop_5_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_STEFANORONCHI_0" file="aura/google_wallpapers/stefanoronchi_0.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_STEFANORONCHI_0_THUMB" file="aura/google_wallpapers/stefanoronchi_0_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_STEFANORONCHI_1" file="aura/google_wallpapers/stefanoronchi_1.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_STEFANORONCHI_1_THUMB" file="aura/google_wallpapers/stefanoronchi_1_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_STEFANORONCHI_2" file="aura/google_wallpapers/stefanoronchi_2.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_STEFANORONCHI_2_THUMB" file="aura/google_wallpapers/stefanoronchi_2_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_STEFANORONCHI_3" file="aura/google_wallpapers/stefanoronchi_3.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_STEFANORONCHI_3_THUMB" file="aura/google_wallpapers/stefanoronchi_3_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_VITALIPROKOPENKO_0" file="aura/google_wallpapers/vitaliprokopenko_0.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_VITALIPROKOPENKO_0_THUMB" file="aura/google_wallpapers/vitaliprokopenko_0_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_VITALIPROKOPENKO_1" file="aura/google_wallpapers/vitaliprokopenko_1.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_VITALIPROKOPENKO_1_THUMB" file="aura/google_wallpapers/vitaliprokopenko_1_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_VITALIPROKOPENKO_2" file="aura/google_wallpapers/vitaliprokopenko_2.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_VITALIPROKOPENKO_2_THUMB" file="aura/google_wallpapers/vitaliprokopenko_2_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALTERSOESTBERGEN_0" file="aura/google_wallpapers/waltersoestbergen_0.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_WALTERSOESTBERGEN_0_THUMB" file="aura/google_wallpapers/waltersoestbergen_0_thumb.jpg" type="BINDATA" /> - <!-- Wallpapers (gradients) used by Ash. --> - <if expr="pp_ifdef('use_ash')"> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT0" file="aura/wallpapers/5-gradient0.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT0_THUMB" file="aura/wallpapers/5-gradient0_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT1" file="aura/wallpapers/5-gradient1.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT1_THUMB" file="aura/wallpapers/5-gradient1_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT2" file="aura/wallpapers/5-gradient2.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT2_THUMB" file="aura/wallpapers/5-gradient2_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT3" file="aura/wallpapers/5-gradient3.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT3_THUMB" file="aura/wallpapers/5-gradient3_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT4" file="aura/wallpapers/5-gradient4.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT4_THUMB" file="aura/wallpapers/5-gradient4_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5" file="aura/wallpapers/5-gradient5.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT5_THUMB" file="aura/wallpapers/5-gradient5_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6" file="aura/wallpapers/5-gradient6.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT6_THUMB" file="aura/wallpapers/5-gradient6_thumb.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7" file="aura/wallpapers/5-gradient7.png" type="BINDATA" /> - <include name="IDR_AURA_WALLPAPERS_5_GRADIENT7_THUMB" file="aura/wallpapers/5-gradient7_thumb.png" type="BINDATA" /> + <!-- TODO(saintlou): The following images are not sorted, we are still experimenting and these are not final. --> + <include name="IDR_AURA_WALLPAPERS_BEACH_DAY" file="aura/google_wallpapers/Beach_Day.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_BEACH_DAY_THUMB" file="aura/google_wallpapers/Beach_Day_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_BEACH_NIGHT" file="aura/google_wallpapers/Beach_Night.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_BEACH_NIGHT_THUMB" file="aura/google_wallpapers/Beach_Night_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_FOREST_DAY" file="aura/google_wallpapers/Forest_Day.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_FOREST_DAY_THUMB" file="aura/google_wallpapers/Forest_Day_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_FOREST_NIGHT" file="aura/google_wallpapers/Forest_Night.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_FOREST_NIGHT_THUMB" file="aura/google_wallpapers/Forest_Night_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MOUNTAIN_DAY" file="aura/google_wallpapers/Mountain_Day.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MOUNTAIN_DAY_THUMB" file="aura/google_wallpapers/Mountain_Day_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MOUNTAIN_NIGHT" file="aura/google_wallpapers/Mountain_Night.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_MOUNTAIN_NIGHT_THUMB" file="aura/google_wallpapers/Mountain_Night_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_NYC_DAY" file="aura/google_wallpapers/NYC_Day.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_NYC_DAY_THUMB" file="aura/google_wallpapers/NYC_Day_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_NYC_NIGHT" file="aura/google_wallpapers/NYC_Night.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_NYC_NIGHT_THUMB" file="aura/google_wallpapers/NYC_Night_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_PLAINS_DAY" file="aura/google_wallpapers/Plains_Day.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_PLAINS_DAY_THUMB" file="aura/google_wallpapers/Plains_Day_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_PLAINS_NIGHT" file="aura/google_wallpapers/PLains_Night.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_PLAINS_NIGHT_THUMB" file="aura/google_wallpapers/PLains_Night_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_SF_DAY" file="aura/google_wallpapers/SF_Day.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_SF_DAY_THUMB" file="aura/google_wallpapers/SF_Day_thumb.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_SF_NIGHT" file="aura/google_wallpapers/SF_Night.jpg" type="BINDATA" /> + <include name="IDR_AURA_WALLPAPERS_SF_NIGHT_THUMB" file="aura/google_wallpapers/SF_Night_thumb.jpg" type="BINDATA" /> </if> <!-- Remaining images only used by Aura. --> |