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

chrome/browser/ui/gtk/avatar_menu_item_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/avatar_menu_item_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ skipping 187 matching lines @@
       base::Bind(&AvatarMenuItemGtk::EditProfile,
                  weak_factory_.GetWeakPtr()));
 }
 
 gboolean AvatarMenuItemGtk::OnEventBoxExpose(GtkWidget* widget,
                                              GdkEventExpose* event) {
   // Draw the focus rectangle.
   if (gtk_widget_has_focus(widget)) {
     GtkAllocation allocation;
     gtk_widget_get_allocation(widget, &allocation);
-    gtk_paint_focus(widget->style, widget->window,
+    gtk_paint_focus(gtk_widget_get_style(widget),
+                    gtk_widget_get_window(widget),
                     gtk_widget_get_state(widget),
                     &event->area, widget, NULL,
                     0, 0,
                     allocation.width, allocation.height);
   }
 
   return TRUE;
 }
 
 void AvatarMenuItemGtk::Init(GtkThemeService* theme_service) {
@@ skipping 93 matching lines @@
 
     GtkSizeGroup* size_group = gtk_size_group_new(GTK_SIZE_GROUP_BOTH);
     gtk_size_group_add_widget(size_group, status_label_);
     gtk_size_group_add_widget(size_group, link_alignment_);
     g_object_unref(size_group);
   }
 
   gtk_box_pack_start(GTK_BOX(item_hbox), item_vbox, TRUE, TRUE, 0);
   gtk_container_add(GTK_CONTAINER(widget_.get()), item_hbox);
 }