GTK: Remove more deprecated stuff.

chrome/browser/ui/gtk/browser_window_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_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <dlfcn.h>
 #include <string>
@@ skipping 436 matching lines @@
   return FALSE;  // Allow subwidgets to paint.
 }
 
 void BrowserWindowGtk::DrawContentShadow(cairo_t* cr) {
   // Draw the shadow above the toolbar. Tabs on the tabstrip will draw over us.
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   int left_x, top_y;
   gtk_widget_translate_coordinates(toolbar_->widget(),
       GTK_WIDGET(window_), 0, 0, &left_x,
       &top_y);
-  int center_width = window_vbox_->allocation.width;
+
+  GtkAllocation window_vbox_allocation;
+  gtk_widget_get_allocation(window_vbox_, &window_vbox_allocation);
+  int center_width = window_vbox_allocation.width;
 
   gfx::CairoCachedSurface* top_center =
       rb.GetNativeImageNamed(IDR_CONTENT_TOP_CENTER).ToCairo();
   gfx::CairoCachedSurface* top_right =
       rb.GetNativeImageNamed(IDR_CONTENT_TOP_RIGHT_CORNER).ToCairo();
   gfx::CairoCachedSurface* top_left =
       rb.GetNativeImageNamed(IDR_CONTENT_TOP_LEFT_CORNER).ToCairo();
 
   int center_left_x = left_x;
   if (ShouldDrawContentDropShadow()) {
@@ skipping 38 matching lines @@
       right_x,
       top_y - kContentShadowThickness,
       top_right->Width(),
       top_right->Height());
   cairo_fill(cr);
 
   // Fill in the sides.  As above, we only draw 2 of the 3 columns on Linux.
   int bottom_y;
   gtk_widget_translate_coordinates(window_vbox_,
       GTK_WIDGET(window_),
-      0, window_vbox_->allocation.height,
+      0, window_vbox_allocation.height,
       NULL, &bottom_y);
   // |side_y| is where to start drawing the side shadows.  The top corners draw
   // the sides down to the bottom of the toolbar.
   int side_y = top_y - kContentShadowThickness + top_right->Height();
   // |side_height| is how many pixels to draw for the side borders.  We do one
   // pixel before the bottom of the web contents because that extra pixel is
   // drawn by the bottom corners.
   int side_height = bottom_y - side_y - 1;
   if (side_height > 0) {
     gfx::CairoCachedSurface* left =
@@ skipping 37 matching lines @@
 
   // Finally, draw the bottom row. Since we don't overlap the contents, we clip
   // the top row of pixels.
   gfx::CairoCachedSurface* bottom =
       rb.GetNativeImageNamed(IDR_CONTENT_BOTTOM_CENTER).ToCairo();
   bottom->SetSource(cr, GTK_WIDGET(window_), left_x + 1, bottom_y - 1);
   cairo_pattern_set_extend(cairo_get_source(cr), CAIRO_EXTEND_REPEAT);
   cairo_rectangle(cr,
       left_x + 1,
       bottom_y,
-      window_vbox_->allocation.width - 2,
+      window_vbox_allocation.width - 2,
       kContentShadowThickness);
   cairo_fill(cr);
 }
 
 void BrowserWindowGtk::DrawPopupFrame(cairo_t* cr,
                                       GtkWidget* widget,
                                       GdkEventExpose* event) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 
   // Like DrawCustomFrame(), except that we use the unthemed resources to draw
@@ skipping 1335 matching lines @@
 }
 
 void BrowserWindowGtk::UpdateCustomFrame() {
   gtk_window_set_decorated(
       window_, !UseCustomFrame() && browser_->type() != Browser::TYPE_SHELL);
   titlebar_->UpdateCustomFrame(UseCustomFrame() && !IsFullscreen());
   UpdateWindowShape(bounds_.width(), bounds_.height());
 }
 
 gfx::Size BrowserWindowGtk::GetNonClientFrameSize() const {
-  return gfx::Size(window_container_->allocation.width -
-                   render_area_floating_container_->allocation.width,
-                   window_container_->allocation.height -
-                   render_area_floating_container_->allocation.height);
+  GtkAllocation window_container_allocation;
+  gtk_widget_get_allocation(window_container_, &window_container_allocation);
+  GtkAllocation render_area_floating_container_allocation;
+  gtk_widget_get_allocation(render_area_floating_container_,
+                            &render_area_floating_container_allocation);
+  return gfx::Size(window_container_allocation.width -
+                   render_area_floating_container_allocation.width,
+                   window_container_allocation.height -
+                   render_area_floating_container_allocation.height);
 }
 
 void BrowserWindowGtk::InvalidateWindow() {
   gdk_window_invalidate_rect(gtk_widget_get_window(GTK_WIDGET(window_)),
                              &GTK_WIDGET(window_)->allocation, TRUE);
 }
 
 void BrowserWindowGtk::SaveWindowPosition() {
   // Browser::SaveWindowPlacement is used for session restore.
   ui::WindowShowState show_state = ui::SHOW_STATE_NORMAL;
@@ skipping 37 matching lines @@
   gtk_widget_queue_draw(toolbar_->widget());
   if (bookmark_bar_.get() &&
       browser_->bookmark_bar_state() != BookmarkBar::DETACHED) {
     gtk_widget_queue_draw(bookmark_bar_->widget());
   }
 }
 
 int BrowserWindowGtk::GetXPositionOfLocationIcon(GtkWidget* relative_to) {
   GtkWidget* location_icon = toolbar_->GetLocationBarView()->
       location_icon_widget();
+
+  GtkAllocation location_icon_allocation;
+  gtk_widget_get_allocation(location_icon, &location_icon_allocation);
+
   int x = 0;
   gtk_widget_translate_coordinates(
       location_icon, relative_to,
-      (location_icon->allocation.width + 1) / 2,
+      (location_icon_allocation.width + 1) / 2,
       0, &x, NULL);
 
   if (!gtk_widget_get_has_window(relative_to)) {
     GtkAllocation allocation;
     gtk_widget_get_allocation(relative_to, &allocation);
     x += allocation.x;
   }
 
   return x;
 }
@@ skipping 439 matching lines @@
           wm_type == ui::WM_OPENBOX ||
           wm_type == ui::WM_XFWM4);
 }
 
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
   browser_window_gtk->Init();
   return browser_window_gtk;
 }