Reapplies r91761.

chrome/browser/ui/gtk/reload_button_gtk.cc

 // Copyright (c) 2011 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/reload_button_gtk.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 32 matching lines @@
       testing_mouse_hovered_(false),
       testing_reload_count_(0) {
   gtk_widget_set_size_request(widget(), reload_.Width(), reload_.Height());
 
   gtk_widget_set_app_paintable(widget(), TRUE);
 
   g_signal_connect(widget(), "clicked", G_CALLBACK(OnClickedThunk), this);
   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),
                    this);
 
   hover_controller_.Init(widget());
   gtk_util::SetButtonTriggersNavigation(widget());
 
   if (theme_service_) {
     theme_service_->InitThemesFor(this);
@@ skipping 13 matching lines @@
 ReloadButtonGtk::~ReloadButtonGtk() {
   widget_.Destroy();
 }
 
 void ReloadButtonGtk::ChangeMode(Mode mode, bool force) {
   intended_mode_ = mode;
 
   // 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();
     stop_to_reload_timer_.Stop();
     visible_mode_ = mode;
 
     stop_.set_paint_override(-1);
     gtk_chrome_button_unset_paint_state(GTK_CHROME_BUTTON(widget_.get()));
 
     UpdateThemeButtons();
@@ skipping 127 matching lines @@
 
 void ReloadButtonGtk::UpdateThemeButtons() {
   bool use_gtk = theme_service_ && theme_service_->UsingNativeTheme();
 
   if (use_gtk) {
     gtk_widget_ensure_style(widget());
     GtkIconSet* icon_set = gtk_style_lookup_icon_set(
         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());
 
       GdkPixbuf* pixbuf = gtk_icon_set_render_icon(
           icon_set,
           widget()->style,
           gtk_widget_get_direction(widget()),
           state,
           GTK_ICON_SIZE_SMALL_TOOLBAR,
           widget(),
@@ skipping 25 matching lines @@
   gtk_chrome_button_set_use_gtk_rendering(GTK_CHROME_BUTTON(widget()), use_gtk);
 }
 
 void ReloadButtonGtk::OnDoubleClickTimer() {
   ChangeMode(intended_mode_, false);
 }
 
 void ReloadButtonGtk::OnStopToReloadTimer() {
   ChangeMode(intended_mode_, true);
 }