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

chrome/browser/themes/browser_theme_pack.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 "chrome/browser/themes/browser_theme_pack.h"
 
 #include <limits.h>
 #include <stddef.h>
 
 #include <limits>
@@ skipping 31 matching lines @@
 
 using content::BrowserThread;
 using extensions::Extension;
 
 namespace {
 
 // Version number of the current theme pack. We just throw out and rebuild
 // 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
 // "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 kMaxID = 0x0000FFFF;  // Max unsigned 16-bit int.
 const int kHeaderID = kMaxID - 1;
 const int kTintsID = kMaxID - 2;
 const int kColorsID = kMaxID - 3;
@@ skipping 32 matching lines @@
   // someone adds a new resource.
   int idr_id;
 
   // String to check for when parsing theme manifests or NULL if this isn't
   // supposed to be changeable by the user.
   const char* const key;
 };
 
 // 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,
      "theme_frame_inactive"},
     {PRS_THEME_FRAME_INCOGNITO, IDR_THEME_FRAME_INCOGNITO,
      "theme_frame_incognito"},
     {PRS_THEME_FRAME_INCOGNITO_INACTIVE, IDR_THEME_FRAME_INCOGNITO_INACTIVE,
      "theme_frame_incognito_inactive"},
     {PRS_THEME_TOOLBAR, IDR_THEME_TOOLBAR, "theme_toolbar"},
     {PRS_THEME_TAB_BACKGROUND, IDR_THEME_TAB_BACKGROUND,
      "theme_tab_background"},
 #if !defined(OS_MACOSX)
     {PRS_THEME_TAB_BACKGROUND_INCOGNITO, IDR_THEME_TAB_BACKGROUND_INCOGNITO,
      "theme_tab_background_incognito"},
 #endif
     {PRS_THEME_TAB_BACKGROUND_V, IDR_THEME_TAB_BACKGROUND_V,
      "theme_tab_background_v"},
     {PRS_THEME_NTP_BACKGROUND, IDR_THEME_NTP_BACKGROUND,
      "theme_ntp_background"},
     {PRS_THEME_FRAME_OVERLAY, IDR_THEME_FRAME_OVERLAY, "theme_frame_overlay"},
     {PRS_THEME_FRAME_OVERLAY_INACTIVE, IDR_THEME_FRAME_OVERLAY_INACTIVE,
      "theme_frame_overlay_inactive"},
     {PRS_THEME_BUTTON_BACKGROUND, IDR_THEME_BUTTON_BACKGROUND,
      "theme_button_background"},
     {PRS_THEME_NTP_ATTRIBUTION, IDR_THEME_NTP_ATTRIBUTION,
      "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);
 
 int GetPersistentIDByNameHelper(const std::string& key,
                                 const PersistingImagesTable* image_table,
                                 size_t image_table_size) {
   for (size_t i = 0; i < image_table_size; ++i) {
     if (image_table[i].key &&
         base::LowerCaseEqualsASCII(key, image_table[i].key)) {
       return image_table[i].persistent_id;
@@ skipping 1067 matching lines @@
     if (!is_copyable && !image_skia.isNull())
       (*image_cache)[prs_id] = gfx::Image(image_skia);
   }
 
   return true;
 }
 
 void BrowserThemePack::CreateImages(ImageCache* images) const {
   CropImages(images);
   CreateFrameImages(images);
-  CreateTintedButtons(GetTintInternal(ThemeProperties::TINT_BUTTONS), images);
   CreateTabBackgroundImages(images);
 }
 
 void BrowserThemePack::CropImages(ImageCache* images) const {
   bool has_frame_border = HasFrameBorder();
   for (size_t i = 0; i < arraysize(kImagesToCrop); ++i) {
     if (has_frame_border && kImagesToCrop[i].skip_if_frame_border)
       continue;
 
     int prs_id = kImagesToCrop[i].prs_id;
@@ skipping 55 matching lines @@
       frame = rb.GetImageNamed(IDR_THEME_FRAME);
     }
     if (!frame.IsEmpty()) {
       temp_output[prs_id] = CreateHSLShiftedImage(
           frame, GetTintInternal(kFrameTintMap[i].value));
     }
   }
   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) {
     int prs_id = kTabBackgroundMap[i].key;
     int prs_base_id = kTabBackgroundMap[i].value;
 
     // We only need to generate the background tab images if we were provided
     // with a PRS_THEME_FRAME.
     ImageCache::const_iterator it = images->find(prs_base_id);
     if (it != images->end()) {
@@ skipping 171 matching lines @@
                                            false,
                                            &bitmap_data)) {
       NOTREACHED() << "Unable to encode theme image for prs_id="
                    << prs_id << " for scale_factor=" << scale_factors_[i];
       break;
     }
     image_memory_[scaled_raw_id] =
         base::RefCountedBytes::TakeVector(&bitmap_data);
   }
 }