Revert 112839 (it probably caused http://crbug.com/106299 ) - GTK: Port omnibox drawing from GdkGC interface to cairo.

GdkGC is deprecated and will be removed in gtk3 and cairo should be faster anyway. This uses the new CairoCachedSurface in gfx::Image.

BUG=79722
TEST=none


Review URL: http://codereview.chromium.org/8781001

TBR=erg@chromium.org
Review URL: http://codereview.chromium.org/8789016

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

2 files changed, 0 insertions, 25 deletions

diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc
index 210e663..34a36e5 100644
--- a/chrome/browser/themes/theme_service.cc
+++ b/chrome/browser/themes/theme_service.cc
@@ -220,20 +220,6 @@ void ThemeService::Init(Profile* profile) {
   LoadThemePrefs();
 }
 
-const gfx::Image* ThemeService::GetImageNamed(int id) const {
-  DCHECK(CalledOnValidThread());
-
-  const gfx::Image* image = NULL;
-
-  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());
 
diff --git a/chrome/browser/themes/theme_service.h b/chrome/browser/themes/theme_service.h
index a6c01c4..2534f71 100644
--- a/chrome/browser/themes/theme_service.h
+++ b/chrome/browser/themes/theme_service.h
@@ -28,10 +28,6 @@ namespace color_utils {
 struct HSL;
 }
 
-namespace gfx {
-class Image;
-}
-
 namespace ui {
 class ResourceBundle;
 }
@@ -144,13 +140,6 @@ class ThemeService : public base::NonThreadSafe,
     REPEAT = 3
   } Tiling;
 
-  // Returns a cross platform image for an id.
-  //
-  // TODO(erg): Make this a virtual, exposed through ui::ThemeProvider and the
-  // main way to get theme properties out of the theme provider since it's
-  // cross platform.
-  const gfx::Image* GetImageNamed(int id) const;
-
   // ui::ThemeProvider implementation.
   virtual void Init(Profile* profile) OVERRIDE;
   virtual SkBitmap* GetBitmapNamed(int id) const OVERRIDE;