Reapplies r91761.

chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc

Index: chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
index 30d4dbc646c28fac82d532c38e2f6f065f4bc368..4b8747025e50c0bd057cc422de1d759966e2b745 100644
--- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc
@@ -359,7 +359,7 @@ bool TabRendererGtk::IsSelected() const {
 }
 
 bool TabRendererGtk::IsVisible() const {
-  return GTK_WIDGET_FLAGS(tab_.get()) & GTK_VISIBLE;
+  return gtk_widget_get_visible(tab_.get());
 }
 
 void TabRendererGtk::SetVisible(bool visible) const {
@@ -1011,7 +1011,7 @@ CustomDrawButton* TabRendererGtk::MakeCloseButton() {
                    G_CALLBACK(OnEnterNotifyEventThunk), this);
   g_signal_connect(button->widget(), "leave-notify-event",
                    G_CALLBACK(OnLeaveNotifyEventThunk), this);
-  GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS);
+  gtk_widget_set_can_focus(button->widget(), FALSE);
   gtk_fixed_put(GTK_FIXED(tab_.get()), button->widget(), 0, 0);
 
   return button;