Merge 43248 - BrowserThemePack: Adds persistant ids for the reload endcaps....

chrome/browser/browser_theme_pack.cc

 // Copyright (c) 2010 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 "chrome/browser/browser_theme_pack.h"
 
 #include <algorithm>
 #include <climits>
 #include <set>
 #include <vector>
@@ skipping 16 matching lines @@
 #include "net/base/file_stream.h"
 #include "net/base/net_errors.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkUnPreMultiply.h"
 
 namespace {
 
 // Version number of the current theme pack. We just throw out and rebuild
 // theme packs that aren't int-equal to this.
-const int kThemePackVersion = 4;
+const int kThemePackVersion = 5;
 
 // IDs that are in the DataPack won't clash with the positive integer
 // int32_t. kHeaderID should always have the maximum value because we want the
 // "header" to be written last. That way we can detect whether the pack was
 // successfully written and ignore and regenerate if it was only partially
 // written (i.e. chrome crashed on a different thread while writing the pack).
 const int kHeaderID = UINT_MAX - 1;
 const int kTintsID = UINT_MAX - 2;
 const int kColorsID = UINT_MAX - 3;
 const int kDisplayPropertiesID = UINT_MAX - 4;
@@ skipping 111 matching lines @@
   { 49, IDR_STOP_P, NULL },
   { 50, IDR_MENU_BOOKMARK, NULL },
   { 51, IDR_MENU_PAGE, NULL },
   { 52, IDR_MENU_PAGE_RTL, NULL },
   { 53, IDR_MENU_CHROME, NULL },
   { 54, IDR_MENU_CHROME_RTL, NULL },
   { 55, IDR_MENU_DROPARROW, NULL },
   { 56, IDR_THROBBER, NULL },
   { 57, IDR_THROBBER_WAITING, NULL },
   { 58, IDR_THROBBER_LIGHT, NULL },
-  { 59, IDR_LOCATIONBG, NULL }
+  { 59, IDR_LOCATIONBG, NULL },
+
+  { 60, IDR_RELOAD_NOBORDER, NULL },
+  { 61, IDR_RELOAD_NOBORDER_CENTER, NULL },
+  { 62, IDR_RELOAD_ENDCAP, NULL },
+  { 63, IDR_RELOAD_ENDCAP_H, NULL },
+  { 64, IDR_RELOAD_ENDCAP_P, NULL }
 };
 
 int GetPersistentIDByName(const std::string& key) {
   for (size_t i = 0; i < arraysize(kPersistingImages); ++i) {
     if (kPersistingImages[i].key != NULL &&
         base::strcasecmp(key.c_str(), kPersistingImages[i].key) == 0) {
       return kPersistingImages[i].persistent_id;
     }
   }
 
@@ skipping 328 matching lines @@
         return true;
       }
     }
   }
 
   return false;
 }
 
 SkBitmap* BrowserThemePack::GetBitmapNamed(int idr_id) const {
   int prs_id = GetPersistentIDByIDR(idr_id);
+  if (prs_id == -1)
+    return NULL;
 
   // Check our cache of prepared images, first.
   ImageCache::const_iterator image_iter = prepared_images_.find(prs_id);
   if (image_iter != prepared_images_.end())
     return image_iter->second;
 
   // Check if we've already loaded this image.
   image_iter = loaded_images_.find(prs_id);
   if (image_iter != loaded_images_.end())
     return image_iter->second;
@@ skipping 429 matching lines @@
 void BrowserThemePack::GenerateTintedButtons(
     color_utils::HSL button_tint,
     ImageCache* processed_bitmaps) const {
   if (button_tint.h != -1 || button_tint.s != -1 || button_tint.l != -1) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     const std::set<int>& idr_ids =
         BrowserThemeProvider::GetTintableToolbarButtons();
     for (std::set<int>::const_iterator it = idr_ids.begin();
          it != idr_ids.end(); ++it) {
       int prs_id = GetPersistentIDByIDR(*it);
-      if (prs_id < 0)
-        continue;
+      DCHECK(prs_id > 0);
 
       // Fetch the image by IDR...
       scoped_ptr<SkBitmap> button(new SkBitmap(*rb.GetBitmapNamed(*it)));
 
       // but save a version with the persistent ID.
       (*processed_bitmaps)[prs_id] = new SkBitmap(
           SkBitmapOperations::CreateHSLShiftedBitmap(*button, button_tint));
     }
   }
 }
@@ skipping 78 matching lines @@
         hsl.h = tints_[i].h;
         hsl.s = tints_[i].s;
         hsl.l = tints_[i].l;
         return hsl;
       }
     }
   }
 
   return BrowserThemeProvider::GetDefaultTint(id);
 }