GTK: Remove most calls to widget->window and replace with accessor.

chrome/browser/ui/gtk/gtk_util.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/gtk_util.h"
 
 #include <cairo/cairo.h>
 
 #include <cstdarg>
 
@@ skipping 328 matching lines @@
     GtkRequisition requisition;
     gtk_widget_size_request(GTK_WIDGET(window), &requisition);
     gtk_widget_set_size_request(
         GTK_WIDGET(window),
         width == -1 ? -1 : std::max(width, requisition.width),
         height == -1 ? -1 : std::max(height, requisition.height));
   }
   gtk_window_set_resizable(window, resizable ? TRUE : FALSE);
 }
 
-void CenterOverWindow(GtkWindow* window, GtkWindow* parent) {

[Elliot Glaysher, 2011/12/08 19:24:54]

Function is never used. Instead of porting the GdkRectangle/->window stuff, I'm
just deleting it.

-  gfx::Rect frame_bounds = gtk_util::GetWidgetScreenBounds(GTK_WIDGET(parent));
-  gfx::Point origin = frame_bounds.origin();
-  gfx::Size size = gtk_util::GetWidgetSize(GTK_WIDGET(window));
-  origin.Offset(
-      (frame_bounds.width() - size.width()) / 2,
-      (frame_bounds.height() - size.height()) / 2);
-
-  // Prevent moving window out of monitor bounds.
-  GdkScreen* screen = gtk_window_get_screen(parent);
-  if (screen) {
-    // It would be better to check against workarea for given monitor
-    // but getting workarea for particular monitor is tricky.
-    gint monitor = gdk_screen_get_monitor_at_window(screen,
-        GTK_WIDGET(parent)->window);
-    GdkRectangle rect;
-    gdk_screen_get_monitor_geometry(screen, monitor, &rect);
-
-    // Check the right bottom corner.
-    if (origin.x() > rect.x + rect.width - size.width())
-      origin.set_x(rect.x + rect.width - size.width());
-    if (origin.y() > rect.y + rect.height - size.height())
-      origin.set_y(rect.y + rect.height - size.height());
-
-    // Check the left top corner.
-    if (origin.x() < rect.x)
-      origin.set_x(rect.x);
-    if (origin.y() < rect.y)
-      origin.set_y(rect.y);
-  }
-
-  gtk_window_move(window, origin.x(), origin.y());
-
-  // Move to user expected desktop if window is already visible.
-  if (GTK_WIDGET(window)->window) {
-    ui::ChangeWindowDesktop(
-        ui::GetX11WindowFromGtkWidget(GTK_WIDGET(window)),
-        ui::GetX11WindowFromGtkWidget(GTK_WIDGET(parent)));
-  }
-}
-
 void MakeAppModalWindowGroup() {
   // Older versions of GTK+ don't give us gtk_window_group_list() which is what
   // we need to add current non-browser modal dialogs to the list. If
   // we have 2.14+ we can do things the correct way.
   GtkWindowGroup* window_group = gtk_window_group_new();
   for (BrowserList::const_iterator it = BrowserList::begin();
        it != BrowserList::end(); ++it) {
     // List all windows in this current group
     GtkWindowGroup* old_group =
         gtk_window_get_group((*it)->window()->GetNativeHandle());
@@ skipping 507 matching lines @@
   //   Widget coordinates are a bit odd; for historical reasons, they are
   //   defined as widget->window coordinates for widgets that are not
   //   GTK_NO_WINDOW widgets, and are relative to widget->allocation.x,
   //   widget->allocation.y for widgets that are GTK_NO_WINDOW widgets.
   //
   // So the base is always (0,0).
   return gfx::Rect(0, 0, widget->allocation.width, widget->allocation.height);
 }
 
 void SetWMLastUserActionTime(GtkWindow* window) {
-  gdk_x11_window_set_user_time(GTK_WIDGET(window)->window, XTimeNow());
+  gdk_x11_window_set_user_time(gtk_widget_get_window(GTK_WIDGET(window)),
+                               XTimeNow());
 }
 
 guint32 XTimeNow() {
   struct timespec ts;
   clock_gettime(CLOCK_MONOTONIC, &ts);
   return ts.tv_sec * 1000 + ts.tv_nsec / 1000000;
 }
 
 bool URLFromPrimarySelection(Profile* profile, GURL* url) {
   GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
@@ skipping 277 matching lines @@
 
 void DoCopy(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Copy, "copy-clipboard");
 }
 
 void DoPaste(BrowserWindow* window) {
   DoCutCopyPaste(window, &RenderViewHost::Paste, "paste-clipboard");
 }
 
 }  // namespace gtk_util