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

chrome/browser/ui/gtk/bubble/bubble_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/bubble/bubble_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/logging.h"
 #include "chrome/browser/ui/gtk/bubble/bubble_accelerators_gtk.h"
@@ skipping 82 matching lines @@
                      GtkWidget* content,
                      ArrowLocationGtk arrow_location,
                      bool grab_input) {
   // If there is a current grab widget (menu, other bubble, etc.), hide it.
   GtkWidget* current_grab_widget = gtk_grab_get_current();
   if (current_grab_widget)
     gtk_widget_hide(current_grab_widget);
 
   DCHECK(!window_);
   anchor_widget_ = anchor_widget;
-  toplevel_window_ = GTK_WINDOW(gtk_widget_get_toplevel(anchor_widget_));
-  DCHECK(gtk_widget_is_toplevel(GTK_WIDGET(toplevel_window_)));
+  toplevel_window_ = gtk_widget_get_toplevel(anchor_widget_);
+  DCHECK(gtk_widget_is_toplevel(toplevel_window_));
   rect_ = rect ? *rect : gtk_util::WidgetBounds(anchor_widget);
   preferred_arrow_location_ = arrow_location;
 
   grab_input_ = grab_input;
   // Using a TOPLEVEL window may cause placement issues with certain WMs but it
   // is necessary to be able to focus the window.
   window_ = gtk_window_new(grab_input ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL);
 
   gtk_widget_set_app_paintable(window_, TRUE);
   // Resizing is handled by the program, not user.
@@ skipping 34 matching lines @@
   signals_.Connect(window_, "expose-event", G_CALLBACK(OnExposeThunk), this);
   signals_.Connect(window_, "size-allocate", G_CALLBACK(OnSizeAllocateThunk),
                    this);
   signals_.Connect(window_, "button-press-event",
                    G_CALLBACK(OnButtonPressThunk), this);
   signals_.Connect(window_, "destroy", G_CALLBACK(OnDestroyThunk), this);
   signals_.Connect(window_, "hide", G_CALLBACK(OnHideThunk), this);
 
   // If the toplevel window is being used as the anchor, then the signals below
   // are enough to keep us positioned correctly.
-  if (anchor_widget_ != GTK_WIDGET(toplevel_window_)) {
+  if (anchor_widget_ != toplevel_window_) {
     signals_.Connect(anchor_widget_, "size-allocate",
                      G_CALLBACK(OnAnchorAllocateThunk), this);
     signals_.Connect(anchor_widget_, "destroy",
                      G_CALLBACK(gtk_widget_destroyed), &anchor_widget_);
   }
 
   signals_.Connect(toplevel_window_, "configure-event",
                    G_CALLBACK(OnToplevelConfigureThunk), this);
   signals_.Connect(toplevel_window_, "unmap-event",
                    G_CALLBACK(OnToplevelUnmapThunk), this);
@@ skipping 93 matching lines @@
   if (right_is_onscreen && (!wants_left || !left_is_onscreen))
     return ARROW_LOCATION_TOP_RIGHT;
   return (wants_left ? ARROW_LOCATION_TOP_LEFT : ARROW_LOCATION_TOP_RIGHT);
 }
 
 bool BubbleGtk::UpdateArrowLocation(bool force_move_and_reshape) {
   if (!toplevel_window_ || !anchor_widget_)
     return false;
 
   gint toplevel_x = 0, toplevel_y = 0;
-  gdk_window_get_position(
-      GTK_WIDGET(toplevel_window_)->window, &toplevel_x, &toplevel_y);
+  gdk_window_get_position(gtk_widget_get_window(toplevel_window_),
+                          &toplevel_x, &toplevel_y);
   int offset_x, offset_y;
-  gtk_widget_translate_coordinates(anchor_widget_, GTK_WIDGET(toplevel_window_),
+  gtk_widget_translate_coordinates(anchor_widget_, toplevel_window_,
                                    rect_.x(), rect_.y(), &offset_x, &offset_y);
 
   ArrowLocationGtk old_location = current_arrow_location_;
   GtkAllocation allocation;
   gtk_widget_get_allocation(window_, &allocation);
   current_arrow_location_ = GetArrowLocation(
       preferred_arrow_location_,
       toplevel_x + offset_x + (rect_.width() / 2),  // arrow_x
       allocation.width);
 
@@ skipping 22 matching lines @@
                                     GDK_EVEN_ODD_RULE);
   gdk_window_shape_combine_region(window_->window, NULL, 0, 0);
   gdk_window_shape_combine_region(window_->window, mask_region_, 0, 0);
 }
 
 void BubbleGtk::MoveWindow() {
   if (!toplevel_window_ || !anchor_widget_)
     return;
 
   gint toplevel_x = 0, toplevel_y = 0;
-  gdk_window_get_position(
-      GTK_WIDGET(toplevel_window_)->window, &toplevel_x, &toplevel_y);
+  gdk_window_get_position(gtk_widget_get_window(toplevel_window_),
+                          &toplevel_x, &toplevel_y);
 
   int offset_x, offset_y;
-  gtk_widget_translate_coordinates(anchor_widget_, GTK_WIDGET(toplevel_window_),
+  gtk_widget_translate_coordinates(anchor_widget_, toplevel_window_,
                                    rect_.x(), rect_.y(), &offset_x, &offset_y);
 
   gint screen_x = 0;
   if (current_arrow_location_ == ARROW_LOCATION_TOP_LEFT) {
     screen_x = toplevel_x + offset_x + (rect_.width() / 2) - kArrowX;
   } else if (current_arrow_location_ == ARROW_LOCATION_TOP_RIGHT) {
     GtkAllocation allocation;
     gtk_widget_get_allocation(window_, &allocation);
     screen_x = toplevel_x + offset_x + (rect_.width() / 2) -
                allocation.width + kArrowX;
   } else {
     NOTREACHED();
   }
 
   gint screen_y = toplevel_y + offset_y + rect_.height() +
                   kArrowToContentPadding;
 
   gtk_window_move(GTK_WINDOW(window_), screen_x, screen_y);
 }
 
 void BubbleGtk::StackWindow() {
   // Stack our window directly above the toplevel window.
   if (toplevel_window_)
-    ui::StackPopupWindow(window_, GTK_WIDGET(toplevel_window_));
+    ui::StackPopupWindow(window_, toplevel_window_);
 }
 
 void BubbleGtk::Observe(int type,
                         const content::NotificationSource& source,
                         const content::NotificationDetails& details) {
   DCHECK_EQ(type, chrome::NOTIFICATION_BROWSER_THEME_CHANGED);
   if (theme_service_->UsingNativeTheme() && match_system_theme_) {
     gtk_widget_modify_bg(window_, GTK_STATE_NORMAL, NULL);
   } else {
     // Set the background color, so we don't need to paint it manually.
@@ skipping 58 matching lines @@
       // Close on C-w and forward the accelerator
       if (modifier & GDK_CONTROL_MASK) {
         gdk_keymap_get_entries_for_keyval(NULL,
                                           keyval,
                                           &keys,
                                           &n_keys);
         if (n_keys) {
           // Forward the accelerator to root window the bubble is anchored
           // to for further processing
           msg.type = GDK_KEY_PRESS;
-          msg.window = GTK_WIDGET(toplevel_window_)->window;
+          msg.window = gtk_widget_get_window(toplevel_window_);
           msg.send_event = TRUE;
           msg.time = GDK_CURRENT_TIME;
           msg.state = modifier | GDK_MOD2_MASK;
           msg.keyval = keyval;
           // length and string are deprecated and thus zeroed out
           msg.length = 0;
           msg.string = NULL;
           msg.hardware_keycode = keys[0].keycode;
           msg.group = keys[0].group;
           msg.is_modifier = 0;
@@ skipping 95 matching lines @@
 gboolean BubbleGtk::OnToplevelUnmap(GtkWidget* widget, GdkEvent* event) {
   Close();
   return FALSE;
 }
 
 void BubbleGtk::OnAnchorAllocate(GtkWidget* widget,
                                  GtkAllocation* allocation) {
   if (!UpdateArrowLocation(false))
     MoveWindow();
 }