GTK: Closing in on being completely GSEALed.

chrome/browser/ui/gtk/browser_titlebar.cc

 // Copyright (c) 2012 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_titlebar.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <string>
@@ skipping 29 matching lines @@
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "grit/ui_resources.h"
+#include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/x/active_window_watcher_x.h"
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/skbitmap_operations.h"
 
 using content::WebContents;
 
@@ skipping 922 matching lines @@
     // Mouse is not over the close button.
     return;
   }
 
   // Create and emit an enter-notify-event on close button.
   GValue return_value;
   return_value.g_type = G_TYPE_BOOLEAN;
   g_value_set_boolean(&return_value, false);
 
   GdkEvent* event = gdk_event_new(GDK_ENTER_NOTIFY);
-  event->crossing.window = GTK_BUTTON(close_button_->widget())->event_window;
+  event->crossing.window =
+      gtk_button_get_event_window(GTK_BUTTON(close_button_->widget()));
   event->crossing.send_event = FALSE;
-  event->crossing.subwindow = close_button_->widget()->window;
+  event->crossing.subwindow = gtk_widget_get_window(close_button_->widget());
   event->crossing.time = gtk_util::XTimeNow();
   event->crossing.x = x;
   event->crossing.y = y;
   event->crossing.x_root = widget_allocation.x;
   event->crossing.y_root = widget_allocation.y;
   event->crossing.mode = GDK_CROSSING_NORMAL;
   event->crossing.detail = GDK_NOTIFY_ANCESTOR;
   event->crossing.focus = true;
   event->crossing.state = 0;
 
@@ skipping 171 matching lines @@
     ui::SimpleMenuModel::Delegate* delegate)
     : SimpleMenuModel(delegate) {
   AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB);
   AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
   AddSeparator();
   AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
   AddSeparator();
   AddCheckItemWithStringId(kShowWindowDecorationsCommand,
                            IDS_SHOW_WINDOW_DECORATIONS_MENU);
 }