diff options
| author | rbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-24 14:00:50 +0000 |
|---|---|---|
| committer | rbyers@chromium.org <rbyers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-24 14:00:50 +0000 |
| commit | bddb387960cee60c99e6fc0ff2ee34f20950d335 (patch) | |
| tree | fa12333e6b1df70702a350e0ffa65d0792db4383 /ash/desktop_background | |
| parent | d54fd0c0d613622d5ea3d240b21373fe070dde6c (diff) | |
| download | chromium_src-bddb387960cee60c99e6fc0ff2ee34f20950d335.zip chromium_src-bddb387960cee60c99e6fc0ff2ee34f20950d335.tar.gz chromium_src-bddb387960cee60c99e6fc0ff2ee34f20950d335.tar.bz2 | |
Undo Revert 128667 - didn't fix 20% size regression on win
Added "final" assets. Will remove the old ones in a later CL.
TBR=ben@chromium.org
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9836076
TBR=saintlou@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9852006
TBR=nduca@google.com
Review URL: https://chromiumcodereview.appspot.com/9808099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128733 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/desktop_background')
| -rw-r--r-- | ash/desktop_background/desktop_background_resources.cc | 552 |
1 files changed, 106 insertions, 446 deletions
diff --git a/ash/desktop_background/desktop_background_resources.cc b/ash/desktop_background/desktop_background_resources.cc index 1eb7c49..5304fae 100644 --- a/ash/desktop_background/desktop_background_resources.cc +++ b/ash/desktop_background/desktop_background_resources.cc @@ -14,6 +14,7 @@ namespace { const ash::WallpaperInfo kDefaultWallpapers[] = { +#if !defined(GOOGLE_CHROME_BUILD) { IDR_AURA_WALLPAPERS_ROMAINGUY_0, IDR_AURA_WALLPAPERS_ROMAINGUY_0_THUMB, @@ -21,545 +22,204 @@ const ash::WallpaperInfo kDefaultWallpapers[] = { "Romain Guy", "http://www.curious-creature.org" }, +#else { - 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, - "Charles Davey", - "http://500px.com/CharlesDavey" - }, - { - IDR_AURA_WALLPAPERS_JOHANNESVANDONGE_0, - IDR_AURA_WALLPAPERS_JOHANNESVANDONGE_0_THUMB, - ash::CENTER_CROPPED, - "Johannes van Donge", - "http://www.diginature.nl" - }, - { - IDR_AURA_WALLPAPERS_JOHANNESVANDONGE_1, - IDR_AURA_WALLPAPERS_JOHANNESVANDONGE_1_THUMB, + IDR_AURA_WALLPAPERS_1_NATURE0, + IDR_AURA_WALLPAPERS_1_NATURE0_THUMB, ash::CENTER_CROPPED, - "Johannes van Donge", - "http://www.diginature.nl" + "Romain Guy", + "http://www.curious-creature.org" }, { - IDR_AURA_WALLPAPERS_JOHANNESVANDONGE_2, - IDR_AURA_WALLPAPERS_JOHANNESVANDONGE_2_THUMB, + IDR_AURA_WALLPAPERS_1_NATURE1, + IDR_AURA_WALLPAPERS_1_NATURE1_THUMB, ash::CENTER_CROPPED, "Johannes van Donge", "http://www.diginature.nl" }, { - IDR_AURA_WALLPAPERS_MARIOMORENO_0, - IDR_AURA_WALLPAPERS_MARIOMORENO_0_THUMB, - ash::CENTER_CROPPED, - "Mario Moreno", - "http://www.mariomorenophotography.com" - }, - { - IDR_AURA_WALLPAPERS_MARIOMORENO_1, - IDR_AURA_WALLPAPERS_MARIOMORENO_1_THUMB, - ash::CENTER_CROPPED, - "Mario Moreno", - "http://www.mariomorenophotography.com" - }, - { - IDR_AURA_WALLPAPERS_MARIOMORENO_2, - IDR_AURA_WALLPAPERS_MARIOMORENO_2_THUMB, - ash::CENTER_CROPPED, - "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, + IDR_AURA_WALLPAPERS_1_NATURE2, + IDR_AURA_WALLPAPERS_1_NATURE2_THUMB, ash::CENTER_CROPPED, - "Mario Moreno", - "http://www.mariomorenophotography.com" + "Oleg Zhukov", + "http://500px.com/eosboy" }, { - IDR_AURA_WALLPAPERS_MARIOMORENO_6, - IDR_AURA_WALLPAPERS_MARIOMORENO_6_THUMB, + IDR_AURA_WALLPAPERS_1_NATURE3, + IDR_AURA_WALLPAPERS_1_NATURE3_THUMB, ash::CENTER_CROPPED, - "Mario Moreno", - "http://www.mariomorenophotography.com" + "Stefano Ronchi", + "http://www.stefanoronchi.com" }, { - IDR_AURA_WALLPAPERS_MARIOMORENO_7, - IDR_AURA_WALLPAPERS_MARIOMORENO_7_THUMB, + IDR_AURA_WALLPAPERS_1_NATURE4, + IDR_AURA_WALLPAPERS_1_NATURE4_THUMB, ash::CENTER_CROPPED, - "Mario Moreno", - "http://www.mariomorenophotography.com" + "Stefano Ronchi", + "http://www.stefanoronchi.com" }, { - IDR_AURA_WALLPAPERS_MARIOMORENO_8, - IDR_AURA_WALLPAPERS_MARIOMORENO_8_THUMB, + IDR_AURA_WALLPAPERS_1_NATURE5, + IDR_AURA_WALLPAPERS_1_NATURE5_THUMB, ash::CENTER_CROPPED, "Mario Moreno", "http://www.mariomorenophotography.com" }, { - IDR_AURA_WALLPAPERS_MARKBRIDGER_0, - IDR_AURA_WALLPAPERS_MARKBRIDGER_0_THUMB, + IDR_AURA_WALLPAPERS_1_NATURE6, + IDR_AURA_WALLPAPERS_1_NATURE6_THUMB, ash::CENTER_CROPPED, - "Mark Bridger", - "http://www.bridgephotography.co.uk" - }, - { - IDR_AURA_WALLPAPERS_MARKBRIDGER_1, - IDR_AURA_WALLPAPERS_MARKBRIDGER_1_THUMB, - ash::CENTER_CROPPED, - "Mark Bridger", - "http://www.bridgephotography.co.uk" - }, - { - IDR_AURA_WALLPAPERS_MARKBRIDGER_2, - IDR_AURA_WALLPAPERS_MARKBRIDGER_2_THUMB, - ash::CENTER_CROPPED, - "Mark Bridger", - "http://www.bridgephotography.co.uk" + "Walter Soestbergen", + "http://www.waltersoestbergen.nl" }, { - IDR_AURA_WALLPAPERS_MARKBRIDGER_3, - IDR_AURA_WALLPAPERS_MARKBRIDGER_3_THUMB, + IDR_AURA_WALLPAPERS_1_NATURE7, + IDR_AURA_WALLPAPERS_1_NATURE7_THUMB, ash::CENTER_CROPPED, "Mark Bridger", "http://www.bridgephotography.co.uk" }, { - IDR_AURA_WALLPAPERS_MARKBRIDGER_4, - IDR_AURA_WALLPAPERS_MARKBRIDGER_4_THUMB, + IDR_AURA_WALLPAPERS_2_LANDSCAPE0, + IDR_AURA_WALLPAPERS_2_LANDSCAPE0_THUMB, ash::CENTER_CROPPED, - "Mark Bridger", - "http://www.bridgephotography.co.uk" + "Vitali Prokopenko", + "http://www.vitphoto.com/" }, { - IDR_AURA_WALLPAPERS_MARKBRIDGER_5, - IDR_AURA_WALLPAPERS_MARKBRIDGER_5_THUMB, + IDR_AURA_WALLPAPERS_2_LANDSCAPE1, + IDR_AURA_WALLPAPERS_2_LANDSCAPE1_THUMB, ash::CENTER_CROPPED, - "Mark Bridger", - "http://www.bridgephotography.co.uk" + "Romain Guy", + "http://www.curious-creature.org" }, { - IDR_AURA_WALLPAPERS_MARKBRIDGER_6, - IDR_AURA_WALLPAPERS_MARKBRIDGER_6_THUMB, + IDR_AURA_WALLPAPERS_2_LANDSCAPE2, + IDR_AURA_WALLPAPERS_2_LANDSCAPE2_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, + IDR_AURA_WALLPAPERS_2_LANDSCAPE3, + IDR_AURA_WALLPAPERS_2_LANDSCAPE3_THUMB, ash::CENTER_CROPPED, "Mike Reyfman", "http://mikereyfman.com" }, { - IDR_AURA_WALLPAPERS_MIKEREYFMAN_1, - IDR_AURA_WALLPAPERS_MIKEREYFMAN_1_THUMB, + IDR_AURA_WALLPAPERS_2_LANDSCAPE4, + IDR_AURA_WALLPAPERS_2_LANDSCAPE4_THUMB, ash::CENTER_CROPPED, "Mike Reyfman", "http://mikereyfman.com" }, { - IDR_AURA_WALLPAPERS_MIKEREYFMAN_2, - IDR_AURA_WALLPAPERS_MIKEREYFMAN_2_THUMB, + IDR_AURA_WALLPAPERS_2_LANDSCAPE5, + IDR_AURA_WALLPAPERS_2_LANDSCAPE5_THUMB, ash::CENTER_CROPPED, "Mike Reyfman", "http://mikereyfman.com" }, { - IDR_AURA_WALLPAPERS_MIKEREYFMAN_3, - IDR_AURA_WALLPAPERS_MIKEREYFMAN_3_THUMB, + IDR_AURA_WALLPAPERS_2_LANDSCAPE6, + IDR_AURA_WALLPAPERS_2_LANDSCAPE6_THUMB, ash::CENTER_CROPPED, "Mike Reyfman", "http://mikereyfman.com" }, { - IDR_AURA_WALLPAPERS_MIKEREYFMAN_4, - IDR_AURA_WALLPAPERS_MIKEREYFMAN_4_THUMB, + IDR_AURA_WALLPAPERS_2_LANDSCAPE7, + IDR_AURA_WALLPAPERS_2_LANDSCAPE7_THUMB, ash::CENTER_CROPPED, - "Mike Reyfman", - "http://mikereyfman.com" + "Romain Guy", + "http://www.curious-creature.org" }, { - IDR_AURA_WALLPAPERS_MIKEREYFMAN_5, - IDR_AURA_WALLPAPERS_MIKEREYFMAN_5_THUMB, + IDR_AURA_WALLPAPERS_3_URBAN0, + IDR_AURA_WALLPAPERS_3_URBAN0_THUMB, ash::CENTER_CROPPED, - "Mike Reyfman", - "http://mikereyfman.com" + "Paulo FLOP", + "http://500px.com/FLOP" }, { - IDR_AURA_WALLPAPERS_MIKEREYFMAN_6, - IDR_AURA_WALLPAPERS_MIKEREYFMAN_6_THUMB, + IDR_AURA_WALLPAPERS_3_URBAN1, + IDR_AURA_WALLPAPERS_3_URBAN1_THUMB, ash::CENTER_CROPPED, "Mike Reyfman", "http://mikereyfman.com" }, { - IDR_AURA_WALLPAPERS_NEILKREMER_0, - IDR_AURA_WALLPAPERS_NEILKREMER_0_THUMB, - ash::CENTER_CROPPED, - "Neil Kremer", - "http://lightshedimagery.smugmug.com" - }, - { - IDR_AURA_WALLPAPERS_NEILKREMER_1, - IDR_AURA_WALLPAPERS_NEILKREMER_1_THUMB, + IDR_AURA_WALLPAPERS_3_URBAN2, + IDR_AURA_WALLPAPERS_3_URBAN2_THUMB, ash::CENTER_CROPPED, "Neil Kremer", "http://lightshedimagery.smugmug.com" }, { - IDR_AURA_WALLPAPERS_NEILKREMER_2, - IDR_AURA_WALLPAPERS_NEILKREMER_2_THUMB, + IDR_AURA_WALLPAPERS_3_URBAN3, + IDR_AURA_WALLPAPERS_3_URBAN3_THUMB, ash::CENTER_CROPPED, "Neil Kremer", "http://lightshedimagery.smugmug.com" }, +#endif { - IDR_AURA_WALLPAPERS_OLEGZHUKOV_0, - IDR_AURA_WALLPAPERS_OLEGZHUKOV_0_THUMB, - ash::CENTER_CROPPED, - "Oleg Zhukov", - "http://500px.com/eosboy" - }, - { - IDR_AURA_WALLPAPERS_OLEGZHUKOV_1, - IDR_AURA_WALLPAPERS_OLEGZHUKOV_1_THUMB, - ash::CENTER_CROPPED, - "Oleg Zhukov", - "http://500px.com/eosboy" - }, - { - IDR_AURA_WALLPAPERS_PAULOFLOP_0, - IDR_AURA_WALLPAPERS_PAULOFLOP_0_THUMB, - ash::CENTER_CROPPED, - "Paulo FLOP", - "http://500px.com/FLOP" - }, - { - IDR_AURA_WALLPAPERS_PAULOFLOP_1, - IDR_AURA_WALLPAPERS_PAULOFLOP_1_THUMB, - ash::CENTER_CROPPED, - "Paulo FLOP", - "http://500px.com/FLOP" - }, - { - IDR_AURA_WALLPAPERS_PAULOFLOP_2, - IDR_AURA_WALLPAPERS_PAULOFLOP_2_THUMB, - ash::CENTER_CROPPED, - "Paulo FLOP", - "http://500px.com/FLOP" - }, - { - IDR_AURA_WALLPAPERS_PAULOFLOP_3, - IDR_AURA_WALLPAPERS_PAULOFLOP_3_THUMB, - ash::CENTER_CROPPED, - "Paulo FLOP", - "http://500px.com/FLOP" - }, - { - 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_5_GRADIENT0, + IDR_AURA_WALLPAPERS_5_GRADIENT0_THUMB, + ash::TILE, + "Chromium", + "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_5_GRADIENT1, + IDR_AURA_WALLPAPERS_5_GRADIENT1_THUMB, + ash::TILE, + "Chromium", + "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_5_GRADIENT2, + IDR_AURA_WALLPAPERS_5_GRADIENT2_THUMB, + ash::TILE, + "Chromium", + "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_5_GRADIENT3, + IDR_AURA_WALLPAPERS_5_GRADIENT3_THUMB, + ash::TILE, + "Chromium", + "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_5_GRADIENT4, + IDR_AURA_WALLPAPERS_5_GRADIENT4_THUMB, + ash::TILE, + "Chromium", + "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_5_GRADIENT5, + IDR_AURA_WALLPAPERS_5_GRADIENT5_THUMB, + ash::TILE, + "Chromium", + "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_5_GRADIENT6, + IDR_AURA_WALLPAPERS_5_GRADIENT6_THUMB, + ash::TILE, + "Chromium", + "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", + IDR_AURA_WALLPAPERS_5_GRADIENT7, + IDR_AURA_WALLPAPERS_5_GRADIENT7_THUMB, + ash::TILE, + "Chromium", + "http://www.chromium.org" }, -#endif // GOOGLE_CHROME_BUILD }; const int kDefaultWallpaperCount = arraysize(kDefaultWallpapers); @@ -567,11 +227,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 = 12; -const int kIcognitoWallpaperIndex = 0; +const int kLastRandomWallpaperIndex = 19; // The first 20 are random. +const int kGuestWallpaperIndex = 26; // IDR_AURA_WALLPAPERS_5_GRADIENT6 #else const int kDefaultWallpaperIndex = 0; -const int kIcognitoWallpaperIndex = kDefaultWallpaperIndex; +const int kGuestWallpaperIndex = kDefaultWallpaperIndex; #endif } // namespace @@ -589,8 +249,8 @@ int GetDefaultWallpaperIndex() { } int GetGuestWallpaperIndex() { - DCHECK(kIcognitoWallpaperIndex < kDefaultWallpaperCount); - return std::min(kIcognitoWallpaperIndex, kDefaultWallpaperCount - 1); + DCHECK(kGuestWallpaperIndex < kDefaultWallpaperCount); + return std::min(kGuestWallpaperIndex, kDefaultWallpaperCount - 1); } int GetWallpaperCount() { |