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

chrome/browser/gtk/back_forward_button_gtk.cc

 // Copyright (c) 2009 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/back_forward_button_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "app/l10n_util.h"
 #include "app/menus/menu_model.h"
 #include "base/message_loop.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/back_forward_menu_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/gtk_util.h"
 #include "chrome/browser/gtk/menu_gtk.h"
 #include "chrome/browser/profile.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 // The time in milliseconds between when the user clicks and the menu appears.
 static const int kMenuTimerDelay = 500;
 
 BackForwardButtonGtk::BackForwardButtonGtk(Browser* browser, bool is_forward)
     : browser_(browser),
       is_forward_(is_forward),
       show_menu_factory_(this) {
-  int normal, active, highlight, depressed, background, tooltip;
+  int normal, pushed, hover, disabled, background, tooltip;
   const char* stock;
   if (is_forward) {
     normal = IDR_FORWARD;
-    active = IDR_FORWARD_P;
-    highlight = IDR_FORWARD_H;
-    depressed = IDR_FORWARD_D;
+    pushed = IDR_FORWARD_P;
+    hover = IDR_FORWARD_H;
+    disabled = IDR_FORWARD_D;
     background = IDR_FORWARD_MASK;
     tooltip = IDS_TOOLTIP_FORWARD;
     stock = GTK_STOCK_GO_FORWARD;
   } else {
     normal = IDR_BACK;
-    active = IDR_BACK_P;
-    highlight = IDR_BACK_H;
-    depressed = IDR_BACK_D;
+    pushed = IDR_BACK_P;
+    hover = IDR_BACK_H;
+    disabled = IDR_BACK_D;
     background = IDR_BACK_MASK;
     tooltip = IDS_TOOLTIP_BACK;
     stock = GTK_STOCK_GO_BACK;
   }
   button_.reset(new CustomDrawButton(
       GtkThemeProvider::GetFrom(browser_->profile()),
-      normal, active, highlight, depressed, background, stock,
+      normal, pushed, hover, disabled, background, stock,
       GTK_ICON_SIZE_SMALL_TOOLBAR));
   gtk_widget_set_tooltip_text(widget(),
                               l10n_util::GetStringUTF8(tooltip).c_str());
-  menu_model_.reset(
-      new BackForwardMenuModel(browser,
-          is_forward ?
-              BackForwardMenuModel::FORWARD_MENU :
-              BackForwardMenuModel::BACKWARD_MENU));
+  menu_model_.reset(new BackForwardMenuModel(browser, is_forward ?
+      BackForwardMenuModel::FORWARD_MENU :
+      BackForwardMenuModel::BACKWARD_MENU));
 
   g_signal_connect(widget(), "clicked",
                    G_CALLBACK(OnClickThunk), this);
   g_signal_connect(widget(), "button-press-event",
                    G_CALLBACK(OnButtonPressThunk), this);
   gtk_widget_add_events(widget(), GDK_POINTER_MOTION_MASK);
   g_signal_connect(widget(), "motion-notify-event",
                    G_CALLBACK(OnMouseMoveThunk), this);
 
   // Popup the menu as left-aligned relative to this widget rather than the
@@ skipping 63 matching lines @@
   g_object_get(settings, "gtk-dnd-drag-threshold", &drag_min_distance, NULL);
   if (event->y - y_position_of_last_press_ < drag_min_distance)
     return FALSE;
 
   // We will show the menu now. Cancel the delayed event.
   show_menu_factory_.RevokeAll();
   ShowBackForwardMenu();
   return FALSE;
 }