Revert 91761 - GTK: More 2.18 goodness. Move from macros to real accessor functions.

chrome/browser/ui/gtk/tabs/tab_renderer_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/tabs/tab_renderer_gtk.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/utf_string_conversions.h"
@@ skipping 340 matching lines @@
 
 bool TabRendererGtk::IsActive() const {
   return true;
 }
 
 bool TabRendererGtk::IsSelected() const {
   return true;
 }
 
 bool TabRendererGtk::IsVisible() const {
-  return gtk_widget_get_visible(tab_.get());
+  return GTK_WIDGET_FLAGS(tab_.get()) & GTK_VISIBLE;
 }
 
 void TabRendererGtk::SetVisible(bool visible) const {
   if (visible) {
     gtk_widget_show(tab_.get());
     if (data_.mini)
       gtk_widget_show(close_button_->widget());
   } else {
     gtk_widget_hide_all(tab_.get());
   }
@@ skipping 637 matching lines @@
       l10n_util::GetStringUTF8(IDS_TOOLTIP_CLOSE_TAB).c_str());
 
   g_signal_connect(button->widget(), "clicked",
                    G_CALLBACK(OnCloseButtonClickedThunk), this);
   g_signal_connect(button->widget(), "button-release-event",
                    G_CALLBACK(OnCloseButtonMouseReleaseThunk), this);
   g_signal_connect(button->widget(), "enter-notify-event",
                    G_CALLBACK(OnEnterNotifyEventThunk), this);
   g_signal_connect(button->widget(), "leave-notify-event",
                    G_CALLBACK(OnLeaveNotifyEventThunk), this);
-  gtk_widget_set_can_focus(button->widget(), FALSE);
+  GTK_WIDGET_UNSET_FLAGS(button->widget(), GTK_CAN_FOCUS);
   gtk_fixed_put(GTK_FIXED(tab_.get()), button->widget(), 0, 0);
 
   return button;
 }
 
 double TabRendererGtk::GetThrobValue() {
   if (mini_title_animation_.get() && mini_title_animation_->is_animating()) {
     return mini_title_animation_->GetCurrentValue() *
         kMiniTitleChangeThrobOpacity;
   }
@@ skipping 64 matching lines @@
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   const gfx::Font& base_font = rb.GetFont(ResourceBundle::BaseFont);
   title_font_ = new gfx::Font(base_font.GetFontName(), kFontPixelSize);
   title_font_height_ = title_font_->GetHeight();
 
   crashed_favicon = rb.GetBitmapNamed(IDR_SAD_FAVICON);
 
   initialized_ = true;
 }