Revert r123782.

chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h

 // 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.
 
 #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>
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "ui/base/gtk/gtk_signal.h"
 #include "ui/gfx/font.h"
 #include "webkit/glue/window_open_disposition.h"
 
 class AutocompleteEditModel;
 class AutocompletePopupModel;
-class ThemeServiceGtk;
+class GtkThemeService;
 class OmniboxView;
 class SkBitmap;
 
 namespace gfx {
 class Image;
 }
 
 namespace ui {
 class GtkSignalRegistrar;
 }
@@ skipping 71 matching lines @@
   scoped_ptr<AutocompletePopupModel> model_;
   OmniboxView* omnibox_view_;
   GtkWidget* location_bar_;
 
   // Our popup window, which is the only widget used, and we paint it on our
   // own.  This widget shouldn't be exposed outside of this class.
   GtkWidget* window_;
   // The pango layout object created from the window, cached across exposes.
   PangoLayout* layout_;
 
-  ThemeServiceGtk* theme_service_;
+  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_;
@@ skipping 19 matching lines @@
   // 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_