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

chrome/browser/ui/gtk/location_bar_view_gtk.cc

Index: chrome/browser/ui/gtk/location_bar_view_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/location_bar_view_gtk.cc	(revision 91773)
+++ chrome/browser/ui/gtk/location_bar_view_gtk.cc	(working copy)
@@ -130,7 +130,7 @@
 // If widget is visible, increment the int pointed to by count.
 // Suitible for use with gtk_container_foreach.
 void CountVisibleWidgets(GtkWidget* widget, gpointer count) {
-  if (gtk_widget_get_visible(widget))
+  if (GTK_WIDGET_VISIBLE(widget))
     *static_cast<int*>(count) += 1;
 }
 
@@ -1158,13 +1158,10 @@
 
   // Only one of |tab_to_search_alignment_| and |tab_to_search_hint_| can be
   // visible at the same time.
-  if (!show_selected_keyword_ &&
-      gtk_widget_get_visible(tab_to_search_alignment_)) {
+  if (!show_selected_keyword_ && GTK_WIDGET_VISIBLE(tab_to_search_alignment_))
     gtk_widget_hide(tab_to_search_alignment_);
-  } else if (!show_keyword_hint_ &&
-             gtk_widget_get_visible(tab_to_search_hint_)) {
+  else if (!show_keyword_hint_ && GTK_WIDGET_VISIBLE(tab_to_search_hint_))
     gtk_widget_hide(tab_to_search_hint_);
-  }
 
   if (show_selected_keyword_) {
     GtkRequisition box, full_label, partial_label;
@@ -1174,7 +1171,7 @@
     int full_partial_width_diff = full_label.width - partial_label.width;
     int full_box_width;
     int partial_box_width;
-    if (gtk_widget_get_visible(tab_to_search_full_label_)) {
+    if (GTK_WIDGET_VISIBLE(tab_to_search_full_label_)) {
       full_box_width = box.width;
       partial_box_width = full_box_width - full_partial_width_diff;
     } else {
@@ -1267,10 +1264,6 @@
     content_setting_bubble_->Close();
 }
 
-bool LocationBarViewGtk::ContentSettingImageViewGtk::IsVisible() {
-  return gtk_widget_get_visible(widget());
-}
-
 void LocationBarViewGtk::ContentSettingImageViewGtk::UpdateFromTabContents(
     TabContents* tab_contents) {
   content_setting_image_model_->UpdateFromTabContents(tab_contents);
@@ -1469,10 +1462,6 @@
     g_object_unref(last_icon_pixbuf_);
 }
 
-bool LocationBarViewGtk::PageActionViewGtk::IsVisible() {
-  return gtk_widget_get_visible(widget());
-}
-
 void LocationBarViewGtk::PageActionViewGtk::UpdateVisibility(
     TabContents* contents, const GURL& url) {
   // Save this off so we can pass it back to the extension when the action gets
Property changes on: chrome/browser/ui/gtk/location_bar_view_gtk.cc
___________________________________________________________________
Added: svn:mergeinfo