GTK: More changes from raw widget->allocation to using the accessor.

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/bind.h"
@@ skipping 565 matching lines @@
 }
 
 void BrowserActionsToolbarGtk::HidePopup() {
   ExtensionPopupGtk* popup = ExtensionPopupGtk::get_current_extension_popup();
   if (popup)
     popup->DestroyPopup();
 }
 
 void BrowserActionsToolbarGtk::AnimateToShowNIcons(int count) {
   desired_width_ = WidthForIconCount(count);
-  start_width_ = button_hbox_->allocation.width;
+
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(button_hbox_.get(), &allocation);
+  start_width_ = allocation.width;
+
   resize_animation_.Reset();
   resize_animation_.Show();
 }
 
 void BrowserActionsToolbarGtk::BrowserActionAdded(const Extension* extension,
                                                   int index) {
   overflow_menu_.reset();
 
   CreateButtonForExtension(extension, index);
 
@@ skipping 158 matching lines @@
   }
 }
 
 gboolean BrowserActionsToolbarGtk::OnDragMotion(GtkWidget* widget,
                                                 GdkDragContext* drag_context,
                                                 gint x, gint y, guint time) {
   // Only handle drags we initiated.
   if (!drag_button_)
     return FALSE;
 
-  if (base::i18n::IsRTL())
-    x = widget->allocation.width - x;
+  if (base::i18n::IsRTL()) {
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(widget, &allocation);
+    x = allocation.width - x;
+  }
+
   drop_index_ = x < kButtonWidth ? 0 : x / (kButtonWidth + kButtonPadding);
 
   // We will go ahead and reorder the child in order to provide visual feedback
   // to the user. We don't inform the model that it has moved until the drag
   // ends.
   gtk_box_reorder_child(GTK_BOX(button_hbox_.get()), drag_button_->widget(),
                         drop_index_);
 
   gdk_drag_status(drag_context, GDK_ACTION_MOVE, time);
   return TRUE;
@@ skipping 45 matching lines @@
                  weak_factory_.GetWeakPtr()));
 }
 
 gboolean BrowserActionsToolbarGtk::OnGripperMotionNotify(
     GtkWidget* widget, GdkEventMotion* event) {
   if (!(event->state & GDK_BUTTON1_MASK))
     return FALSE;
 
   // Calculate how much the user dragged the gripper and subtract that off the
   // button container's width.
-  int distance_dragged = base::i18n::IsRTL() ?
-      -event->x :
-      event->x - widget->allocation.width;
-  gint new_width = button_hbox_->allocation.width - distance_dragged;
+  int distance_dragged;
+  if (base::i18n::IsRTL()) {
+    distance_dragged = -event->x;
+  } else {
+    GtkAllocation widget_allocation;
+    gtk_widget_get_allocation(widget, &widget_allocation);
+    distance_dragged = event->x - widget_allocation.width;
+  }
+
+  GtkAllocation button_hbox_allocation;
+  gtk_widget_get_allocation(button_hbox_.get(), &button_hbox_allocation);
+  gint new_width = button_hbox_allocation.width - distance_dragged;
   SetButtonHBoxWidth(new_width);
 
   return FALSE;
 }
 
 gboolean BrowserActionsToolbarGtk::OnGripperExpose(GtkWidget* gripper,
                                                    GdkEventExpose* expose) {
   return TRUE;
 }
 
@@ skipping 11 matching lines @@
 
 gboolean BrowserActionsToolbarGtk::OnGripperLeaveNotify(
     GtkWidget* gripper, GdkEventCrossing* event) {
   if (!(event->state & GDK_BUTTON1_MASK))
     gdk_window_set_cursor(gtk_widget_get_window(gripper), NULL);
   return FALSE;
 }
 
 gboolean BrowserActionsToolbarGtk::OnGripperButtonRelease(
     GtkWidget* gripper, GdkEventButton* event) {
-  gfx::Rect gripper_rect(0, 0,
-                         gripper->allocation.width, gripper->allocation.height);
+  GtkAllocation allocation;
+  gtk_widget_get_allocation(gripper, &allocation);
+  gfx::Rect gripper_rect(0, 0, allocation.width, allocation.height);
+
   gfx::Point release_point(event->x, event->y);
   if (!gripper_rect.Contains(release_point))
     gdk_window_set_cursor(gtk_widget_get_window(gripper), NULL);
 
   // After the user resizes the toolbar, we want to smartly resize it to be
   // the perfect size to fit the buttons.
   int visible_icon_count =
       gtk_chrome_shrinkable_hbox_get_visible_child_count(
           GTK_CHROME_SHRINKABLE_HBOX(button_hbox_.get()));
   AnimateToShowNIcons(visible_icon_count);
@@ skipping 75 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();
 }