Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Unified Diff: chrome/browser/automation/ui_controls_gtk.cc

Issue 8625001: GTK: Part 1 of removing GtkWidget->window to close up GSEALs. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Ignore chromeos Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/automation/ui_controls_gtk.cc
diff --git a/chrome/browser/automation/ui_controls_gtk.cc b/chrome/browser/automation/ui_controls_gtk.cc
index 0ca2378080398ea48f757899b5d361109a00ef3e..df52ddce7d8e572e37178079e268a0e973ecd2c3 100644
--- a/chrome/browser/automation/ui_controls_gtk.cc
+++ b/chrome/browser/automation/ui_controls_gtk.cc
@@ -88,7 +88,7 @@ void FakeAMouseMotionEvent(gint x, gint y) {
if (grab_widget) {
// If there is a grab, we need to target all events at it regardless of
// what widget the mouse is over.
- event->motion.window = grab_widget->window;
+ event->motion.window = gtk_widget_get_window(grab_widget);
} else {
event->motion.window = gdk_window_at_pointer(&x, &y);
}
@@ -122,16 +122,16 @@ bool SendKeyPress(gfx::NativeWindow window,
GtkWidget* grab_widget = gtk_grab_get_current();
if (grab_widget) {
// If there is a grab, send all events to the grabbed widget.
- event_window = grab_widget->window;
+ event_window = gtk_widget_get_window(grab_widget);
} else if (window) {
- event_window = GTK_WIDGET(window)->window;
+ event_window = gtk_widget_get_window(GTK_WIDGET(window));
} else {
// No target was specified. Send the events to the active toplevel.
GList* windows = gtk_window_list_toplevels();
for (GList* element = windows; element; element = g_list_next(element)) {
GtkWindow* this_window = GTK_WINDOW(element->data);
if (gtk_window_is_active(this_window)) {
- event_window = GTK_WIDGET(this_window)->window;
+ event_window = gtk_widget_get_window(GTK_WIDGET(this_window));
break;
}
}
@@ -201,7 +201,7 @@ bool SendMouseEvents(MouseButton type, int state) {
if (grab_widget) {
// If there is a grab, we need to target all events at it regardless of
// what widget the mouse is over.
- event->button.window = grab_widget->window;
+ event->button.window = gtk_widget_get_window(grab_widget);
gdk_window_get_pointer(event->button.window, &x, &y, NULL);
} else {
event->button.window = gdk_window_at_pointer(&x, &y);
« no previous file with comments | « chrome/browser/automation/automation_provider_gtk.cc ('k') | chrome/browser/tab_contents/tab_contents_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698