This CL removes ResourceBundle::GetBitmapNamed() and ThemeProvider::GetBitmapNamed()

BUG=153180
Test=Compiles

R=sail,erg
TBR=sky

Review URL: https://chromiumcodereview.appspot.com/11015007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160789 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 0 insertions, 23 deletions

diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index f5fe3df..5a77c12 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -318,11 +318,6 @@ std::string ResourceBundle::ReloadLocaleResources(
   return LoadLocaleResources(pref_locale);
 }
 
-SkBitmap* ResourceBundle::GetBitmapNamed(int resource_id) {
-  const SkBitmap* bitmap = GetImageNamed(resource_id).ToSkBitmap();
-  return const_cast<SkBitmap*>(bitmap);
-}
-
 gfx::ImageSkia* ResourceBundle::GetImageSkiaNamed(int resource_id) {
   const gfx::ImageSkia* image = GetImageNamed(resource_id).ToImageSkia();
   return const_cast<gfx::ImageSkia*>(image);
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index fcc07db..ef22f67 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -165,13 +165,6 @@ class UI_EXPORT ResourceBundle {
   // on another thread.
   std::string ReloadLocaleResources(const std::string& pref_locale);
 
-  // Gets the bitmap with the specified resource_id from the current module
-  // data. Returns a pointer to a shared instance of the SkBitmap. This shared
-  // bitmap is owned by the resource bundle and should not be freed.
-  //
-  // !! THIS IS DEPRECATED. PLEASE USE THE METHOD BELOW. !!
-  SkBitmap* GetBitmapNamed(int resource_id);
-
   // Gets image with the specified resource_id from the current module data.
   // Returns a pointer to a shared instance of gfx::ImageSkia. This shared
   // instance is owned by the resource bundle and should not be freed.
diff --git a/ui/base/theme_provider.h b/ui/base/theme_provider.h
index f5d1b05..007094f 100644
--- a/ui/base/theme_provider.h
+++ b/ui/base/theme_provider.h
@@ -50,12 +50,6 @@ class UI_EXPORT ThemeProvider {
  public:
   virtual ~ThemeProvider();
 
-  // Get the bitmap specified by |id|. An implementation of ThemeProvider should
-  // have its own source of ids (e.g. an enum, or external resource bundle).
-  // TODO(pkotwicz): Get rid of GetBitmapNamed once all code uses
-  // GetImageSkiaNamed.
-  virtual SkBitmap* GetBitmapNamed(int id) const = 0;
-
   // Get the image specified by |id|. An implementation of ThemeProvider should
   // have its own source of ids (e.g. an enum, or external resource bundle).
   virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const = 0;
diff --git a/ui/views/widget/default_theme_provider.cc b/ui/views/widget/default_theme_provider.cc
index 3cbf6fe..a04b5bf 100644
--- a/ui/views/widget/default_theme_provider.cc
+++ b/ui/views/widget/default_theme_provider.cc
@@ -17,10 +17,6 @@ DefaultThemeProvider::DefaultThemeProvider() {}
 
 DefaultThemeProvider::~DefaultThemeProvider() {}
 
-SkBitmap* DefaultThemeProvider::GetBitmapNamed(int id) const {
-  return ResourceBundle::GetSharedInstance().GetBitmapNamed(id);
-}
-
 gfx::ImageSkia* DefaultThemeProvider::GetImageSkiaNamed(int id) const {
   return ResourceBundle::GetSharedInstance().GetImageSkiaNamed(id);
 }
diff --git a/ui/views/widget/default_theme_provider.h b/ui/views/widget/default_theme_provider.h
index d69f37e..f4befb0 100644
--- a/ui/views/widget/default_theme_provider.h
+++ b/ui/views/widget/default_theme_provider.h
@@ -25,7 +25,6 @@ class VIEWS_EXPORT DefaultThemeProvider : public ui::ThemeProvider {
   virtual ~DefaultThemeProvider();
 
   // Overridden from ui::ThemeProvider:
-  virtual SkBitmap* GetBitmapNamed(int id) const OVERRIDE;
   virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE;
   virtual SkColor GetColor(int id) const OVERRIDE;
   virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE;