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

chrome/browser/ui/gtk/browser_actions_toolbar_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/browser_actions_toolbar_gtk.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/i18n/rtl.h"
@@ skipping 374 matching lines @@
   overflow_button_.reset(new CustomDrawButton(
       theme_service_,
       IDR_BROWSER_ACTIONS_OVERFLOW,
       IDR_BROWSER_ACTIONS_OVERFLOW_P,
       IDR_BROWSER_ACTIONS_OVERFLOW_H,
       0,
       gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_NONE)));
 
   GtkWidget* gripper = gtk_button_new();
   gtk_widget_set_size_request(gripper, kResizeGripperWidth, -1);
-  gtk_widget_set_can_focus(gripper, FALSE);
-
+  GTK_WIDGET_UNSET_FLAGS(gripper, GTK_CAN_FOCUS);
   gtk_widget_add_events(gripper, GDK_POINTER_MOTION_MASK);
   signals_.Connect(gripper, "motion-notify-event",
                    G_CALLBACK(OnGripperMotionNotifyThunk), this);
   signals_.Connect(gripper, "expose-event",
                    G_CALLBACK(OnGripperExposeThunk), this);
   signals_.Connect(gripper, "enter-notify-event",
                    G_CALLBACK(OnGripperEnterNotifyThunk), this);
   signals_.Connect(gripper, "leave-notify-event",
                    G_CALLBACK(OnGripperLeaveNotifyThunk), this);
   signals_.Connect(gripper, "button-release-event",
@@ skipping 184 matching lines @@
                                                   int index) {
   overflow_menu_.reset();
 
   CreateButtonForExtension(extension, index);
 
   // If we are still initializing the container, don't bother animating.
   if (!model_->extensions_initialized())
     return;
 
   // Animate the addition if we are showing all browser action buttons.
-  if (!gtk_widget_get_visible(overflow_area_)) {
+  if (!GTK_WIDGET_VISIBLE(overflow_area_)) {
     AnimateToShowNIcons(button_count());
     model_->SetVisibleIconCount(button_count());
   }
 }
 
 void BrowserActionsToolbarGtk::BrowserActionRemoved(
     const Extension* extension) {
   overflow_menu_.reset();
 
   if (drag_button_ != NULL) {
     // Break the current drag.
     gtk_grab_remove(button_hbox_.get());
   }
 
   RemoveButtonForExtension(extension);
 
-  if (!gtk_widget_get_visible(overflow_area_)) {
+  if (!GTK_WIDGET_VISIBLE(overflow_area_)) {
     AnimateToShowNIcons(button_count());
     model_->SetVisibleIconCount(button_count());
   }
 }
 
 void BrowserActionsToolbarGtk::BrowserActionMoved(const Extension* extension,
                                                   int index) {
   // We initiated this move action, and have already moved the button.
   if (drag_button_ != NULL)
     return;
@@ skipping 97 matching lines @@
       gtk_chrome_shrinkable_hbox_get_visible_child_count(
           GTK_CHROME_SHRINKABLE_HBOX(button_hbox_.get()));
   if (showing_icon_count == 0) {
     gtk_alignment_set_padding(GTK_ALIGNMENT(overflow_alignment_), 0, 0, 0, 0);
   } else {
     gtk_alignment_set_padding(GTK_ALIGNMENT(overflow_alignment_), 0, 0,
                               kButtonChevronPadding, 0);
   }
 
   if (button_count() > showing_icon_count) {
-    if (!gtk_widget_get_visible(overflow_area_)) {
+    if (!GTK_WIDGET_VISIBLE(overflow_area_)) {
       if (drag_button_) {
         // During drags, when the overflow chevron shows for the first time,
         // take that much space away from |button_hbox_| to make the drag look
         // smoother.
         GtkRequisition req;
         gtk_widget_size_request(chevron(), &req);
         gint overflow_width = req.width;
         gtk_widget_size_request(button_hbox_.get(), &req);
         gint button_hbox_width = req.width;
         button_hbox_width = std::max(button_hbox_width - overflow_width, 0);
@@ skipping 204 matching lines @@
 
   menu->PopupAsContext(gfx::Point(event->x_root, event->y_root),
                        event->time);
   return TRUE;
 }
 
 void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) {
   if (!resize_animation_.is_animating())
     UpdateChevronVisibility();
 }