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

chrome/browser/gtk/custom_button.h

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef CHROME_BROWSER_GTK_CUSTOM_BUTTON_H_
 #define CHROME_BROWSER_GTK_CUSTOM_BUTTON_H_
 
 #include <gtk/gtk.h>
 
 #include <string>
 
@@ skipping 14 matching lines @@
 
 // CustomDrawButtonBase provides the base for building a custom drawn button.
 // It handles managing the pixbufs containing all the static images used to draw
 // the button.  It also manages painting these pixbufs.
 class CustomDrawButtonBase : public NotificationObserver {
  public:
   // If the images come from ResourceBundle rather than the theme provider,
   // pass in NULL for |theme_provider|.
   CustomDrawButtonBase(GtkThemeProvider* theme_provider,
                        int normal_id,
-                       int active_id,
-                       int highlight_id,
-                       int depressed_id,
+                       int pressed_id,
+                       int hover_id,
+                       int disabled_id,
                        int background_id);
 
   ~CustomDrawButtonBase();
 
   // Flip the image horizontally. Not to be used for RTL/LTR reasons. (In RTL
   // mode, this will unflip the image.)
   void set_flipped(bool flipped) { flipped_ = flipped; }
 
   // Returns the dimensions of the first surface.
   int Width() const;
@@ skipping 22 matching lines @@
 
   // The background image.
   scoped_ptr<CairoCachedSurface> background_image_;
 
   // If non-negative, the state to paint the button.
   int paint_override_;
 
   // We need to remember the image ids that the user passes in and the theme
   // provider so we can reload images if the user changes theme.
   int normal_id_;
-  int active_id_;
-  int highlight_id_;
-  int depressed_id_;
+  int pressed_id_;
+  int hover_id_;
+  int disabled_id_;
   int button_background_id_;
   GtkThemeProvider* theme_provider_;
 
   // Whether the button is flipped horizontally. Not used for RTL (we get
   // flipped versions from the theme provider). Used for the flipped window
   // buttons.
   bool flipped_;
 
   // Used to listen for theme change notifications.
   NotificationRegistrar registrar_;
@@ skipping 31 matching lines @@
 };
 
 // CustomDrawButton is a plain button where all its various states are drawn
 // with static images. In GTK rendering mode, it will show the standard button
 // with GTK |stock_id|.
 class CustomDrawButton : public NotificationObserver {
  public:
   // The constructor takes 4 resource ids.  If a resource doesn't exist for a
   // button, pass in 0.
   CustomDrawButton(int normal_id,
-                   int active_id,
-                   int highlight_id,
-                   int depressed_id);
+                   int pressed_id,
+                   int hover_id,
+                   int disabled_id);
 
   // Same as above, but uses themed (and possibly tinted) images.
   CustomDrawButton(GtkThemeProvider* theme_provider,
                    int normal_id,
-                   int active_id,
-                   int highlight_id,
-                   int depressed_id,
+                   int pressed_id,
+                   int hover_id,
+                   int disabled_id,
                    int background_id,
                    const char* stock_id,
                    GtkIconSize stock_size);
 
   ~CustomDrawButton();
 
   void Init();
 
   // Flip the image horizontally. Not to be used for RTL/LTR reasons. (In RTL
   // mode, this will unflip the image.)
@@ skipping 53 matching lines @@
   const char* gtk_stock_name_;
   GtkIconSize icon_size_;
 
   // Used to listen for theme change notifications.
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomDrawButton);
 };
 
 #endif  // CHROME_BROWSER_GTK_CUSTOM_BUTTON_H_