Cleanup: Rename gtk button state names to (a) match other platforms and (b) n...

chrome/browser/gtk/browser_toolbar_gtk.cc

 // Copyright (c) 2010 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/gtk/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <X11/XF86keysym.h>
 
@@ skipping 157 matching lines @@
   gtk_box_pack_start(GTK_BOX(back_forward_hbox_), forward_->widget(), FALSE,
                      FALSE, 0);
 
   gtk_box_pack_start(GTK_BOX(toolbar_left_), back_forward_hbox_, FALSE,
                      FALSE, kToolbarWidgetSpacing);
 
   reload_.reset(new ReloadButtonGtk(location_bar_.get(), browser_));
   gtk_box_pack_start(GTK_BOX(toolbar_left_), reload_->widget(), FALSE, FALSE,
                      0);
 
-  home_.reset(BuildToolbarButton(IDR_HOME, IDR_HOME_P, IDR_HOME_H, 0,
-                                 IDR_BUTTON_MASK,
-                                 l10n_util::GetStringUTF8(IDS_TOOLTIP_HOME),
-                                 GTK_STOCK_HOME, kToolbarWidgetSpacing));
+  home_.reset(new CustomDrawButton(GtkThemeProvider::GetFrom(profile_),
+                                   IDR_HOME, IDR_HOME_P, IDR_HOME_H, 0,
+                                   IDR_BUTTON_MASK, GTK_STOCK_HOME,
+                                   GTK_ICON_SIZE_SMALL_TOOLBAR));
+  gtk_widget_set_tooltip_text(home_->widget(),
+      l10n_util::GetStringUTF8(IDS_TOOLTIP_HOME).c_str());
+  g_signal_connect(home_->widget(), "clicked",
+                   G_CALLBACK(OnButtonClickThunk), this);
+  gtk_box_pack_start(GTK_BOX(toolbar_left_), home_->widget(), FALSE, FALSE,
+                     kToolbarWidgetSpacing);
   gtk_util::SetButtonTriggersNavigation(home_->widget());
 
   gtk_box_pack_start(GTK_BOX(toolbar_), toolbar_left_, FALSE, FALSE, 0);
 
   location_hbox_ = gtk_hbox_new(FALSE, 0);
   location_bar_->Init(ShouldOnlyShowLocation());
   gtk_box_pack_start(GTK_BOX(location_hbox_), location_bar_->widget(), TRUE,
                      TRUE, 0);
 
   g_signal_connect(location_hbox_, "expose-event",
@@ skipping 227 matching lines @@
 void BrowserToolbarGtk::UpdateTabContents(TabContents* contents,
                                           bool should_restore_state) {
   location_bar_->Update(should_restore_state ? contents : NULL);
 
   if (actions_toolbar_.get())
     actions_toolbar_->Update();
 }
 
 // BrowserToolbarGtk, private --------------------------------------------------
 
-CustomDrawButton* BrowserToolbarGtk::BuildToolbarButton(
-    int normal_id, int active_id, int highlight_id, int depressed_id,
-    int background_id, const std::string& localized_tooltip,
-    const char* stock_id, int spacing) {
-  CustomDrawButton* button = new CustomDrawButton(
-      GtkThemeProvider::GetFrom(profile_),
-      normal_id, active_id, highlight_id, depressed_id, background_id, stock_id,
-      GTK_ICON_SIZE_SMALL_TOOLBAR);
-
-  gtk_widget_set_tooltip_text(button->widget(),
-                              localized_tooltip.c_str());
-  g_signal_connect(button->widget(), "clicked",
-                   G_CALLBACK(OnButtonClickThunk), this);
-
-  gtk_box_pack_start(GTK_BOX(toolbar_left_), button->widget(), FALSE, FALSE,
-                     spacing);
-  return button;
-}
-
 GtkWidget* BrowserToolbarGtk::BuildToolbarMenuButton(
     const std::string& localized_tooltip,
     OwnedWidgetGtk* owner) {
   GtkWidget* button = theme_provider_->BuildChromeButton();
   owner->Own(button);
 
   gtk_widget_set_tooltip_text(button, localized_tooltip.c_str());
   g_signal_connect(button, "button-press-event",
                    G_CALLBACK(OnMenuButtonPressEventThunk), this);
   GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS);
@@ skipping 284 matching lines @@
 
   return FALSE;
 }
 
 bool BrowserToolbarGtk::UpgradeAnimationIsFaded() {
   return upgrade_reminder_animation_.cycles_remaining() > 0 &&
       // This funky looking math makes the badge throb for 2 seconds once
       // every 8 seconds.
       ((upgrade_reminder_animation_.cycles_remaining() - 1) / 2) % 4 == 0;
 }