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

chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.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_UI_GTK_OMNIBOX_OMNIBOX_POPUP_VIEW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_OMNIBOX_OMNIBOX_POPUP_VIEW_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
@@ skipping 10 matching lines @@
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/gfx/font.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditModel;
 class AutocompletePopupModel;
 class GtkThemeService;
 class OmniboxView;
 class SkBitmap;
 
-namespace gfx {
-class Image;
-}
-
 class OmniboxPopupViewGtk : public AutocompletePopupView,
                             public content::NotificationObserver {
  public:
   OmniboxPopupViewGtk(const gfx::Font& font,
                       OmniboxView* omnibox_view,
                       AutocompleteEditModel* edit_model,
                       GtkWidget* location_bar);
   virtual ~OmniboxPopupViewGtk();
 
   // Overridden from AutocompletePopupView:
@@ skipping 27 matching lines @@
 
   // Restack the popup window directly above the browser's toplevel window.
   void StackWindow();
 
   // Convert a y-coordinate to the closest line / result.
   size_t LineFromY(int y);
 
   // Accept a line of the results, for example, when the user clicks a line.
   void AcceptLine(size_t line, WindowOpenDisposition disposition);
 
-  const gfx::Image* IconForMatch(const AutocompleteMatch& match, bool selected);
+  GdkPixbuf* IconForMatch(const AutocompleteMatch& match, bool selected);
 
   CHROMEGTK_CALLBACK_1(OmniboxPopupViewGtk, gboolean, HandleMotion,
                        GdkEventMotion*);
 
   CHROMEGTK_CALLBACK_1(OmniboxPopupViewGtk, gboolean, HandleButtonPress,
                        GdkEventButton*);
 
   CHROMEGTK_CALLBACK_1(OmniboxPopupViewGtk, gboolean, HandleButtonRelease,
                        GdkEventButton*);
 
@@ skipping 12 matching lines @@
 
   GtkThemeService* theme_service_;
   content::NotificationRegistrar registrar_;
 
   // Font used for suggestions after being derived from the constructor's
   // |font|.
   gfx::Font font_;
 
   // Used to cache GdkPixbufs and map them from the SkBitmaps they were created
   // from.
-  typedef std::map<const SkBitmap*, gfx::Image*> ImageMap;
-  ImageMap images_;
+  typedef std::map<const SkBitmap*, GdkPixbuf*> PixbufMap;
+  PixbufMap pixbufs_;
 
   // A list of colors which we should use for drawing the popup. These change
   // between gtk and normal mode.
   GdkColor border_color_;
   GdkColor background_color_;
   GdkColor selected_background_color_;
   GdkColor hovered_background_color_;
   GdkColor content_text_color_;
   GdkColor selected_content_text_color_;
   GdkColor content_dim_text_color_;
   GdkColor selected_content_dim_text_color_;
   GdkColor url_text_color_;
   GdkColor url_selected_text_color_;
 
   // If the user cancels a dragging action (i.e. by pressing ESC), we don't have
   // a convenient way to release mouse capture. Instead we use this flag to
   // simply ignore all remaining drag events, and the eventual mouse release
   // event. Since OnDragCanceled() can be called when we're not dragging, this
   // flag is reset to false on a mouse pressed event, to make sure we don't
   // erroneously ignore the next drag.
   bool ignore_mouse_drag_;
 
   // Whether our popup is currently open / shown, or closed / hidden.
   bool opened_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxPopupViewGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_OMNIBOX_OMNIBOX_POPUP_VIEW_GTK_H_