Crop images from custom themes before storing them into the theme pack

chrome/browser/ui/libgtk2ui/gtk2_ui.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/ui/libgtk2ui/gtk2_ui.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
@@ skipping 291 matching lines @@
   fake_label_.Destroy();
   fake_entry_.Destroy();
 
   ClearAllThemeData();
 }
 
 bool Gtk2UI::UseNativeTheme() const {
   return true;
 }
 
-gfx::Image* Gtk2UI::GetThemeImageNamed(int id) const {
+gfx::Image Gtk2UI::GetThemeImageNamed(int id) const {
   // Try to get our cached version:
   ImageCache::const_iterator it = gtk_images_.find(id);
   if (it != gtk_images_.end())
     return it->second;
 
   if (/*use_gtk_ && */ IsOverridableImage(id)) {
-    gfx::Image* image = new gfx::Image(
+    gfx::Image image = gfx::Image(
         gfx::ImageSkia::CreateFrom1xBitmap(GenerateGtkThemeBitmap(id)));
     gtk_images_[id] = image;
     return image;
   }
 
-  return NULL;
+  return gfx::Image();
 }
 
 bool Gtk2UI::GetColor(int id, SkColor* color) const {
   ColorMap::const_iterator it = colors_.find(id);
   if (it != colors_.end()) {
     *color = it->second;
     return true;
   }
 
   return false;
@@ skipping 452 matching lines @@
 
     canvas.DrawRect(gfx::Rect(0, 0, kToolbarImageWidth, gradient_size), paint);
   }
 
   canvas.FillRect(gfx::Rect(0, gradient_size, kToolbarImageWidth,
                             kToolbarImageHeight - gradient_size), base);
   return canvas.ExtractImageRep().sk_bitmap();
 }
 
 SkBitmap Gtk2UI::GenerateTabImage(int base_id) const {
-  const SkBitmap* base_image = GetThemeImageNamed(base_id)->ToSkBitmap();
+  const SkBitmap* base_image = GetThemeImageNamed(base_id).ToSkBitmap();
   SkBitmap bg_tint = SkBitmapOperations::CreateHSLShiftedBitmap(
       *base_image, GetDefaultTint(ThemeProperties::TINT_BACKGROUND_TAB));
   return SkBitmapOperations::CreateTiledBitmap(
       bg_tint, 0, 0, bg_tint.width(), bg_tint.height());
 }
 
 SkBitmap Gtk2UI::GenerateTintedIcon(
     int base_id,
     const color_utils::HSL& tint) const {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
@@ skipping 157 matching lines @@
   // Finally, we convert our pixbuf into a type we can use.
   SkBitmap border = GdkPixbufToImageSkia(pixbuf);
   g_object_unref(pixbuf);
   g_object_unref(pixmap);
   gtk_widget_destroy(window);
 
   return border;
 }
 
 void Gtk2UI::ClearAllThemeData() {
-  STLDeleteValues(&gtk_images_);
+  gtk_images_.clear();
 }
 
 }  // namespace libgtk2ui
 
 ui::LinuxUI* BuildGtk2UI() {
   return new libgtk2ui::Gtk2UI;
 }