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

chrome/browser/themes/theme_service.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_THEMES_THEME_SERVICE_H_
 #define CHROME_BROWSER_THEMES_THEME_SERVICE_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 10 matching lines @@
 class BrowserThemePack;
 class ThemeServiceTest;
 class Extension;
 class FilePath;
 class Profile;
 
 namespace color_utils {
 struct HSL;
 }
 
-namespace gfx {
-class Image;
-}
-
 namespace ui {
 class ResourceBundle;
 }
 using ui::ResourceBundle;
 
 #ifdef __OBJC__
 @class NSString;
 // Sent whenever the browser theme changes.  Object => NSValue wrapping the
 // ThemeService that changed.
 extern "C" NSString* const kBrowserThemeDidChangeNotification;
@@ skipping 92 matching lines @@
   } AlignmentMasks;
 
   // Background tiling choices.
   typedef enum {
     NO_REPEAT = 0,
     REPEAT_X = 1,
     REPEAT_Y = 2,
     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;
   virtual SkColor GetColor(int id) const OVERRIDE;
   virtual bool GetDisplayProperty(int id, int* result) const OVERRIDE;
   virtual bool ShouldUseNativeFrame() const OVERRIDE;
   virtual bool HasCustomImage(int id) const OVERRIDE;
   virtual RefCountedMemory* GetRawData(int id) const OVERRIDE;
 #if defined(OS_MACOSX)
   virtual NSImage* GetNSImageNamed(int id, bool allow_default) const OVERRIDE;
@@ skipping 149 matching lines @@
 
   // The number of infobars currently displayed.
   int number_of_infobars_;
 
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(ThemeService);
 };
 
 #endif  // CHROME_BROWSER_THEMES_THEME_SERVICE_H_