Add GetImageSkiaNamed to resource_bundle and theme_provider

chrome/browser/themes/theme_service.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/theme_service.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/browser_theme_pack.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/image/image_skia.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "ui/views/widget/native_widget_win.h"
 #endif
 
 using content::BrowserThread;
 using content::UserMetricsAction;
 using ui::ResourceBundle;
 
 // Strings used in alignment properties.
@@ skipping 202 matching lines @@
   if (theme_pack_.get())
     image = theme_pack_->GetImageNamed(id);
 
   if (!image)
     image = &rb_.GetNativeImageNamed(id);
 
   return image;
 }
 
 SkBitmap* ThemeService::GetBitmapNamed(int id) const {
-  DCHECK(CalledOnValidThread());
+  const gfx::Image* image = GetImageNamed(id);
+  if (!image)
+    return NULL;
 
-  SkBitmap* bitmap = NULL;
+  return const_cast<SkBitmap*>(image->ToSkBitmap());
+}
 
-  if (theme_pack_.get())
-    bitmap = theme_pack_->GetBitmapNamed(id);
-
-  if (!bitmap)
-    bitmap = rb_.GetBitmapNamed(id);
-
-  return bitmap;
+gfx::ImageSkia* ThemeService::GetImageSkiaNamed(int id) const {
+  const gfx::Image* image = GetImageNamed(id);
+  if (!image)
+    return NULL;
+  // TODO(pkotwicz): Remove this const cast.  The gfx::Image interface returns
+  // its images const. GetImageSkiaNamed() also should but has many callsites.
+  return const_cast<gfx::ImageSkia*>(image->ToImageSkia());
 }
 
 SkColor ThemeService::GetColor(int id) const {
   DCHECK(CalledOnValidThread());
 
   SkColor color;
   if (theme_pack_.get() && theme_pack_->GetColor(id, &color))
     return color;
 
   // For backward compat with older themes, some newer colors are generated from
@@ skipping 408 matching lines @@
 void ThemeService::OnInfobarDisplayed() {
   number_of_infobars_++;
 }
 
 void ThemeService::OnInfobarDestroyed() {
   number_of_infobars_--;
 
   if (number_of_infobars_ == 0)
     RemoveUnusedThemes();
 }