GTK: A bunch more removal of deprecated raw GtkWidget access, focusing on GtkWidget->window

webkit/plugins/npapi/gtk_plugin_container_manager.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 "webkit/plugins/npapi/gtk_plugin_container_manager.h"
 
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
 #include "ui/base/gtk/gtk_compat.h"
@@ skipping 67 matching lines @@
   if (!move.rects_valid)
     return;
 
   // TODO(piman): if the widget hasn't been realized (e.g. the tab has been
   // torn off and the parent gtk widget has been detached from the hierarchy),
   // we lose the cutout information.
   if (gtk_widget_get_realized(widget)) {
     GdkRectangle clip_rect = move.clip_rect.ToGdkRectangle();
     GdkRegion* clip_region = gdk_region_rectangle(&clip_rect);
     gfx::SubtractRectanglesFromRegion(clip_region, move.cutout_rects);
-    gdk_window_shape_combine_region(widget->window, clip_region, 0, 0);
+    gdk_window_shape_combine_region(gtk_widget_get_window(widget),
+                                    clip_region, 0, 0);
     gdk_region_destroy(clip_region);
   }
 
   // Update the window position.  Resizing is handled by WebPluginDelegate.
   // TODO(deanm): Verify that we only need to move and not resize.
   // TODO(evanm): we should cache the last shape and position and skip all
   // of this business in the common case where nothing has changed.
   int current_x, current_y;
 
   // Until the above TODO is resolved, we can grab the last position
@@ skipping 54 matching lines @@
   GtkPluginContainerManager* plugin_container_manager =
       static_cast<GtkPluginContainerManager*>(user_data);
 
   gfx::PluginWindowHandle id = plugin_container_manager->MapWidgetToID(widget);
   if (id)
     gtk_socket_add_id(GTK_SOCKET(widget), id);
 }
 
 }  // namespace npapi
 }  // namespace webkit