Revert r123782.

chrome/browser/ui/gtk/download/download_shelf_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/gtk/download/download_shelf_gtk.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
 #include "chrome/browser/ui/gtk/download/download_item_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.h"
+#include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
-#include "chrome/browser/ui/gtk/theme_service_gtk.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/notification_source.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources_standard.h"
 #include "ui/base/gtk/gtk_screen_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 31 matching lines @@
 // The area to the top of the shelf that is considered part of its "zone".
 const int kShelfAuraSize = 40;
 
 }  // namespace
 
 using content::DownloadItem;
 
 DownloadShelfGtk::DownloadShelfGtk(Browser* browser, GtkWidget* parent)
     : browser_(browser),
       is_showing_(false),
-      theme_service_(ThemeServiceGtk::GetFrom(browser->profile())),
+      theme_service_(GtkThemeService::GetFrom(browser->profile())),
       close_on_mouse_out_(false),
       mouse_in_shelf_(false),
       weak_factory_(this) {
   // Logically, the shelf is a vbox that contains two children: a one pixel
   // tall event box, which serves as the top border, and an hbox, which holds
   // the download items and other shelf widgets (close button, show-all-
   // downloads link).
   // To make things pretty, we have to add a few more widgets. To get padding
   // right, we stick the hbox in an alignment. We put that alignment in an
   // event box so we can color the background.
@@ skipping 305 matching lines @@
 
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&DownloadShelfGtk::Close, weak_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kAutoCloseDelayMs));
 }
 
 void DownloadShelfGtk::MouseEnteredShelf() {
   weak_factory_.InvalidateWeakPtrs();
 }