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

chrome/browser/ui/gtk/bookmarks/bookmark_bar_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/bookmarks/bookmark_bar_gtk.h"
 
 #include <vector>
 
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
@@ skipping 492 matching lines @@
 
 void BookmarkBarGtk::SetInstructionState() {
   if (model_)
     show_instructions_ = model_->GetBookmarkBarNode()->empty();
 
   gtk_widget_set_visible(bookmark_toolbar_.get(), !show_instructions_);
   gtk_widget_set_visible(instructions_, show_instructions_);
 }
 
 void BookmarkBarGtk::SetChevronState() {
-  if (!gtk_widget_get_visible(bookmark_hbox_))
+  if (!GTK_WIDGET_VISIBLE(bookmark_hbox_))
     return;
 
   if (show_instructions_) {
     gtk_widget_hide(overflow_button_);
     return;
   }
 
   int extra_space = 0;
-  if (gtk_widget_get_visible(overflow_button_))
+  if (GTK_WIDGET_VISIBLE(overflow_button_))
     extra_space = overflow_button_->allocation.width;
 
   int overflow_idx = GetFirstHiddenBookmark(extra_space, NULL);
   if (overflow_idx == -1)
     gtk_widget_hide(overflow_button_);
   else
     gtk_widget_show_all(overflow_button_);
 }
 
 void BookmarkBarGtk::UpdateOtherBookmarksVisibility() {
@@ skipping 563 matching lines @@
       new MenuGtk(NULL, current_context_menu_controller_->menu_model()));
   current_context_menu_->PopupAsContext(
       gfx::Point(event->x_root, event->y_root),
       event->time);
 }
 
 gboolean BookmarkBarGtk::OnButtonPressed(GtkWidget* sender,
                                          GdkEventButton* event) {
   last_pressed_coordinates_ = gfx::Point(event->x, event->y);
 
-  if (event->button == 3 && gtk_widget_get_visible(bookmark_hbox_)) {
+  if (event->button == 3 && GTK_WIDGET_VISIBLE(bookmark_hbox_)) {
     const BookmarkNode* node = GetNodeForToolButton(sender);
     DCHECK(node);
     DCHECK(page_navigator_);
     PopupMenuForNode(sender, node, event);
   }
 
   return FALSE;
 }
 
 gboolean BookmarkBarGtk::OnSyncErrorButtonPressed(GtkWidget* sender,
@@ skipping 327 matching lines @@
 void BookmarkBarGtk::OnEditBookmarksEnabledChanged() {
   GtkDestDefaults dest_defaults =
       *edit_bookmarks_enabled_ ? GTK_DEST_DEFAULT_ALL :
                                  GTK_DEST_DEFAULT_DROP;
   gtk_drag_dest_set(overflow_button_, dest_defaults, NULL, 0, kDragAction);
   gtk_drag_dest_set(other_bookmarks_button_, dest_defaults,
                     NULL, 0, kDragAction);
   ui::SetDestTargetList(overflow_button_, kDestTargetList);
   ui::SetDestTargetList(other_bookmarks_button_, kDestTargetList);
 }