Remove a bunch of pre-MD toolbar code and assets.

chrome/browser/themes/browser_theme_pack.cc

Index: chrome/browser/themes/browser_theme_pack.cc
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc
index f3e6f1ed962a0c2b6c16750ccd0519ee43c25a1f..6017979640870342350e44e979b513a943b4cdfe 100644
--- a/chrome/browser/themes/browser_theme_pack.cc
+++ b/chrome/browser/themes/browser_theme_pack.cc
@@ -49,7 +49,7 @@ namespace {
 // theme packs that aren't int-equal to this. Increment this number if you
 // change default theme assets or if you need themes to recreate their generated
 // images (which are cached).
-const int kThemePackVersion = 42;
+const int kThemePackVersion = 43;
 
 // IDs that are in the DataPack won't clash with the positive integer
 // uint16_t. kHeaderID should always have the maximum value because we want the
@@ -102,9 +102,6 @@ struct PersistingImagesTable {
 
 // IDR_* resource names change whenever new resources are added; use persistent
 // IDs when storing to a cached pack.
-//
-// TODO(erg): The cocoa port is the last user of the IDR_*_[HP] variants. These
-// should be removed once the cocoa port no longer uses them.
 PersistingImagesTable kPersistingImages[] = {
     {PRS_THEME_FRAME, IDR_THEME_FRAME, "theme_frame"},
     {PRS_THEME_FRAME_INACTIVE, IDR_THEME_FRAME_INACTIVE,
@@ -133,36 +130,6 @@ PersistingImagesTable kPersistingImages[] = {
      "theme_ntp_attribution"},
     {PRS_THEME_WINDOW_CONTROL_BACKGROUND, IDR_THEME_WINDOW_CONTROL_BACKGROUND,
      "theme_window_control_background"},
-
-    // The rest of these entries have no key because they can't be overridden
-    // from the json manifest.
-    {15, IDR_BACK, NULL},
-    {16, IDR_BACK_D, NULL},
-    {17, IDR_BACK_H, NULL},
-    {18, IDR_BACK_P, NULL},
-    {19, IDR_FORWARD, NULL},
-    {20, IDR_FORWARD_D, NULL},
-    {21, IDR_FORWARD_H, NULL},
-    {22, IDR_FORWARD_P, NULL},
-#if defined(OS_MACOSX)
-    {23, IDR_HOME, NULL},
-    {24, IDR_HOME_H, NULL},
-    {25, IDR_HOME_P, NULL},
-#endif
-    {26, IDR_RELOAD, NULL},
-    {27, IDR_RELOAD_H, NULL},
-    {28, IDR_RELOAD_P, NULL},
-    {29, IDR_STOP, NULL},
-    {30, IDR_STOP_D, NULL},
-    {31, IDR_STOP_H, NULL},
-    {32, IDR_STOP_P, NULL},
-    {33, IDR_TOOLS, NULL},
-    {34, IDR_TOOLS_H, NULL},
-    {35, IDR_TOOLS_P, NULL},
-    {36, IDR_MENU_DROPARROW, NULL},
-    {37, IDR_TOOLBAR_BEZEL_HOVER, NULL},
-    {38, IDR_TOOLBAR_BEZEL_PRESSED, NULL},
-    {39, IDR_TOOLS_BAR, NULL},
 };
 const size_t kPersistingImagesLength = arraysize(kPersistingImages);
 
@@ -1250,7 +1217,6 @@ bool BrowserThemePack::LoadRawBitmapsTo(
 void BrowserThemePack::CreateImages(ImageCache* images) const {
   CropImages(images);
   CreateFrameImages(images);
-  CreateTintedButtons(GetTintInternal(ThemeProperties::TINT_BUTTONS), images);
   CreateTabBackgroundImages(images);
 }
 
@@ -1326,28 +1292,6 @@ void BrowserThemePack::CreateFrameImages(ImageCache* images) const {
   MergeImageCaches(temp_output, images);
 }
 
-void BrowserThemePack::CreateTintedButtons(
-    const color_utils::HSL& button_tint,
-    ImageCache* processed_images) const {
-  if (button_tint.h != -1 || button_tint.s != -1 || button_tint.l != -1) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    const std::set<int>& idr_ids =
-        ThemeProperties::GetTintableToolbarButtons();
-    for (std::set<int>::const_iterator it = idr_ids.begin();
-         it != idr_ids.end(); ++it) {
-      int prs_id = GetPersistentIDByIDR(*it);
-      DCHECK(prs_id > 0);
-
-      // Fetch the image by IDR...
-      gfx::Image& button = rb.GetImageNamed(*it);
-
-      // but save a version with the persistent ID.
-      (*processed_images)[prs_id] =
-          CreateHSLShiftedImage(button, button_tint);
-    }
-  }
-}
-
 void BrowserThemePack::CreateTabBackgroundImages(ImageCache* images) const {
   ImageCache temp_output;
   for (size_t i = 0; i < arraysize(kTabBackgroundMap); ++i) {