Replace the index mapping of wallpaper picker UI and hard coded wallpaper index in C++

ash/desktop_background/desktop_background_resources.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/desktop_background/desktop_background_resources.h"
 
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 205 matching lines @@
     {
         IDR_AURA_WALLPAPERS_5_GRADIENT7,
         IDR_AURA_WALLPAPERS_5_GRADIENT7_THUMB,
         ash::TILE,
         "Chromium",
         "http://www.chromium.org"
     },
 };
 
 const int kDefaultWallpaperCount = arraysize(kDefaultWallpapers);
+// -1 reserved for random wallpaper and -2 for customized wallpaper.

[sky, 2012/04/20 19:51:05]

This is awful. How about an enum: RANDOM, CUSTOMIZED, SPECIFIC?

[bshe, 2012/04/20 20:42:41]

The positive index value is currently correspond to one of the default
wallpapers. So I guess I need to assign negative value to the enum for RANDOM,
CUSTOMIZED, SPECIFIC or a very large positive number. I am not sure if this is
preferred?

Also, it seems something similar is being used here:
http://code.google.com/searchframe#OAMlx_jo-ck/src/chrome/browser/chromeos/lo...
. 

I am also planning to completely remove the index and use string instead for new
wallpaper UI. In that case, I will remove the ugly index here.

On 2012/04/20 19:51:05, sky wrote:

+const int kInvalidWallpaperIndex = -3;
 
 // TODO(saintlou): These hardcoded indexes, although checked against the size
 // of the array are really hacky.
 #if defined(GOOGLE_CHROME_BUILD)
 const int kDefaultWallpaperIndex = 16; // IDR_AURA_WALLPAPERS_3_URBAN0
 const int kGuestWallpaperIndex = 26;   // IDR_AURA_WALLPAPERS_5_GRADIENT6
 #else
 const int kDefaultWallpaperIndex = 0;
 const int kGuestWallpaperIndex = kDefaultWallpaperIndex;
 #endif
 
 }  // namespace
 
 namespace ash {
 
+int GetInvalidWallpaperIndex() {
+  return kInvalidWallpaperIndex;
+}
+
 int GetDefaultWallpaperIndex() {
   DCHECK(kDefaultWallpaperIndex < kDefaultWallpaperCount);
   return std::min(kDefaultWallpaperIndex, kDefaultWallpaperCount - 1);
 }
 
 int GetGuestWallpaperIndex() {
   DCHECK(kGuestWallpaperIndex < kDefaultWallpaperCount);
   return std::min(kGuestWallpaperIndex, kDefaultWallpaperCount - 1);
 }
 
 int GetWallpaperCount() {
   return kDefaultWallpaperCount;
 }
 
 const SkBitmap& GetWallpaper(int index) {
   DCHECK(index >= 0 && index < kDefaultWallpaperCount);
   return *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
       kDefaultWallpapers[index].id).ToSkBitmap();
 }
 
-const SkBitmap& GetWallpaperThumbnail(int index) {
-  DCHECK(index >= 0 && index < kDefaultWallpaperCount);
-  return *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-      kDefaultWallpapers[index].thumb_id).ToSkBitmap();
-}
-
 const WallpaperInfo& GetWallpaperInfo(int index) {
   return kDefaultWallpapers[index];
 }
 
 }  // namespace ash