Reapplies r91761.

chrome/browser/ui/gtk/custom_button.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/custom_button.h"
 
 #include "base/basictypes.h"
 #include "chrome/browser/ui/gtk/cairo_cached_surface.h"
 #include "chrome/browser/ui/gtk/gtk_chrome_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
@@ skipping 54 matching lines @@
 }
 
 int CustomDrawButtonBase::Height() const {
   return surfaces_[0]->Height();
 }
 
 gboolean CustomDrawButtonBase::OnExpose(GtkWidget* widget,
                                         GdkEventExpose* e,
                                         gdouble hover_state) {
   int paint_state = paint_override_ >= 0 ?
-                    paint_override_ : GTK_WIDGET_STATE(widget);
+                    paint_override_ : gtk_widget_get_state(widget);
 
   // If the paint state is PRELIGHT then set it to NORMAL (we will paint the
   // hover state according to |hover_state_|).
   if (paint_state == GTK_STATE_PRELIGHT)
     paint_state = GTK_STATE_NORMAL;
   bool animating_hover = hover_state > 0.0 &&
       paint_state == GTK_STATE_NORMAL;
   CairoCachedSurface* pixbuf = PixbufForState(paint_state);
   CairoCachedSurface* hover_pixbuf = PixbufForState(GTK_STATE_PRELIGHT);
 
@@ skipping 181 matching lines @@
                  NotificationService::AllSources());
 }
 
 CustomDrawButton::~CustomDrawButton() {
   widget_.Destroy();
   native_widget_.Destroy();
 }
 
 void CustomDrawButton::Init() {
   widget_.Own(gtk_chrome_button_new());
-  GTK_WIDGET_UNSET_FLAGS(widget(), GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus(widget(), FALSE);
   g_signal_connect(widget(), "expose-event",
                    G_CALLBACK(OnCustomExposeThunk), this);
   hover_controller_.Init(widget());
 }
 
 void CustomDrawButton::Observe(int type,
     const NotificationSource& source, const NotificationDetails& details) {
   DCHECK(chrome::NOTIFICATION_BROWSER_THEME_CHANGED == type);
   SetBrowserTheme();
 }
@@ skipping 49 matching lines @@
     gtk_widget_set_app_paintable(widget(), TRUE);
   }
 
   gtk_chrome_button_set_use_gtk_rendering(
       GTK_CHROME_BUTTON(widget()), UseGtkTheme());
 }
 
 bool CustomDrawButton::UseGtkTheme() {
   return theme_service_ && theme_service_->UsingNativeTheme();
 }