Revert r123782.

chrome/browser/ui/gtk/omnibox/omnibox_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_VIEW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_OMNIBOX_OMNIBOX_VIEW_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
@@ skipping 21 matching lines @@
 class Profile;
 
 namespace gfx {
 class Font;
 }
 
 namespace ui {
 class MultiAnimation;
 }
 
-class ThemeServiceGtk;
+class GtkThemeService;
 
 class OmniboxViewGtk : public OmniboxView,
                        public content::NotificationObserver,
                        public ui::AnimationDelegate {
  public:
   // Modeled like the Windows CHARRANGE.  Represent a pair of cursor position
   // offsets.  Since GtkTextIters are invalid after the buffer is changed, we
   // work in character offsets (not bytes).
   struct CharRange {
     CharRange() : cp_min(0), cp_max(0) { }
@@ skipping 348 matching lines @@
   // IDs of the signal handlers for "mark-set" on |text_buffer_|.
   gulong mark_set_handler_id_;
   gulong mark_set_handler_id2_;
 
   // Is the first mouse button currently down?  When selection marks get moved,
   // we use this to determine if the user was highlighting text with the mouse
   // -- if so, we avoid selecting all the text on mouse-up.
   bool button_1_pressed_;
 
   // Supplies colors, et cetera.
-  ThemeServiceGtk* theme_service_;
+  GtkThemeService* theme_service_;
 
   content::NotificationRegistrar registrar_;
 
   // Indicates if Enter key was pressed.
   //
   // It's used in the key press handler to detect an Enter key press event
   // during sync dispatch of "end-user-action" signal so that an unexpected
   // change caused by the event can be ignored in OnAfterPossibleChange().
   bool enter_was_pressed_;
 
@@ skipping 67 matching lines @@
   // The view that is going to be focused next. Only valid while handling
   // "focus-out" events.
   GtkWidget* going_to_focus_;
 
   ui::GtkSignalRegistrar signals_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxViewGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_OMNIBOX_OMNIBOX_VIEW_GTK_H_