Reapplies r91761.

chrome/browser/ui/gtk/reload_button_gtk.cc

Index: chrome/browser/ui/gtk/reload_button_gtk.cc
diff --git a/chrome/browser/ui/gtk/reload_button_gtk.cc b/chrome/browser/ui/gtk/reload_button_gtk.cc
index 890baa3ba053a47d910f41dcec483a39794bd421..5daf4de9dd2f3277e18c869b34e133df82bcb08a 100644
--- a/chrome/browser/ui/gtk/reload_button_gtk.cc
+++ b/chrome/browser/ui/gtk/reload_button_gtk.cc
@@ -50,7 +50,7 @@ ReloadButtonGtk::ReloadButtonGtk(LocationBarViewGtk* location_bar,
   g_signal_connect(widget(), "expose-event", G_CALLBACK(OnExposeThunk), this);
   g_signal_connect(widget(), "leave-notify-event",
                    G_CALLBACK(OnLeaveNotifyThunk), this);
-  GTK_WIDGET_UNSET_FLAGS(widget(), GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus(widget(), FALSE);
 
   gtk_widget_set_has_tooltip(widget(), TRUE);
   g_signal_connect(widget(), "query-tooltip", G_CALLBACK(OnQueryTooltipThunk),
@@ -84,7 +84,7 @@ void ReloadButtonGtk::ChangeMode(Mode mode, bool force) {
   // If the change is forced, or the user isn't hovering the icon, or it's safe
   // to change it to the other image type, make the change immediately;
   // otherwise we'll let it happen later.
-  if (force || ((GTK_WIDGET_STATE(widget()) == GTK_STATE_NORMAL) &&
+  if (force || ((gtk_widget_get_state(widget()) == GTK_STATE_NORMAL) &&
       !testing_mouse_hovered_) || ((mode == MODE_STOP) ?
           !double_click_timer_.IsRunning() : (visible_mode_ != MODE_STOP))) {
     double_click_timer_.Stop();
@@ -232,8 +232,7 @@ void ReloadButtonGtk::UpdateThemeButtons() {
         widget()->style,
         (visible_mode_ == MODE_RELOAD) ? GTK_STOCK_REFRESH : GTK_STOCK_STOP);
     if (icon_set) {
-      GtkStateType state = static_cast<GtkStateType>(
-          GTK_WIDGET_STATE(widget()));
+      GtkStateType state = gtk_widget_get_state(widget());
       if (visible_mode_ == MODE_STOP && stop_.paint_override() != -1)
         state = static_cast<GtkStateType>(stop_.paint_override());