Revert r123782.

chrome/browser/ui/panels/panel_browser_window_gtk.cc

 // 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.
 
 #include "chrome/browser/ui/panels/panel_browser_window_gtk.h"
 
 #include "base/bind.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/gtk/browser_titlebar.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
+#include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/nine_box.h"
-#include "chrome/browser/ui/gtk/theme_service_gtk.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_bounds_animation.h"
 #include "chrome/browser/ui/panels/panel_browser_titlebar_gtk.h"
 #include "chrome/browser/ui/panels/panel_drag_gtk.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_strip.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
@@ skipping 257 matching lines @@
                                            GtkWidget* widget,
                                            GdkEventExpose* event) {
   NOTREACHED();
 }
 
 const gfx::Image* PanelBrowserWindowGtk::GetThemeFrameImage() const {
   PaintState paint_state = GetPaintState();
   if (paint_state == PAINT_FOR_ATTENTION)
     return GetAttentionBackgroundImage();
 
-  ThemeServiceGtk* theme_provider = ThemeServiceGtk::GetFrom(
+  GtkThemeService* theme_provider = GtkThemeService::GetFrom(
       browser()->profile());
   if (theme_provider->UsingDefaultTheme()) {
     // We choose to use the window frame theme to paint panels for the default
     // theme. This is because the default tab theme does not work well for the
     // user to recognize active and inactive panels.
     return theme_provider->GetImageNamed(paint_state == PAINT_AS_ACTIVE ?
         IDR_THEME_FRAME : IDR_THEME_FRAME_INACTIVE);
   }
 
   return theme_provider->GetImageNamed(paint_state == PAINT_AS_ACTIVE ?
@@ skipping 407 matching lines @@
       break;
     case RESTORE_BUTTON:
       button = titlebar->unminimize_button();
       break;
     default:
       NOTREACHED();
       return false;
   }
   return gtk_widget_get_visible(button->widget());
 }