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

Unified Diff: chrome/browser/ui/gtk/bubble/bubble_gtk.cc

Issue 9147044: GTK: More GSEALing. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: jhawkins refactor Created 8 years, 11 months 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
« no previous file with comments | « chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc ('k') | chrome/browser/ui/gtk/chrome_gtk_frame.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/bubble/bubble_gtk.cc
diff --git a/chrome/browser/ui/gtk/bubble/bubble_gtk.cc b/chrome/browser/ui/gtk/bubble/bubble_gtk.cc
index 1035f42061c726cfdfa691580f03298bfae5a8fa..c4c35a6fc9beeb5a77e6b341d717978bc43493b1 100644
--- a/chrome/browser/ui/gtk/bubble/bubble_gtk.cc
+++ b/chrome/browser/ui/gtk/bubble/bubble_gtk.cc
@@ -461,7 +461,7 @@ gboolean BubbleGtk::OnGtkAccelerator(GtkAccelGroup* group,
gboolean BubbleGtk::OnExpose(GtkWidget* widget, GdkEventExpose* expose) {
// TODO(erg): This whole method will need to be rewritten in cairo.
- GdkDrawable* drawable = GDK_DRAWABLE(window_->window);
+ GdkDrawable* drawable = GDK_DRAWABLE(gtk_widget_get_window(window_));
GdkGC* gc = gdk_gc_new(drawable);
gdk_gc_set_rgb_fg_color(gc, &kFrameColor);
@@ -494,14 +494,15 @@ gboolean BubbleGtk::OnButtonPress(GtkWidget* widget,
// check that it falls within our bounds, since we've grabbed the pointer and
// some events that actually occurred in other windows will be reported with
// respect to our window).
- if (event->window == window_->window &&
+ GdkWindow* gdk_window = gtk_widget_get_window(window_);
+ if (event->window == gdk_window &&
(mask_region_ && gdk_region_point_in(mask_region_, event->x, event->y))) {
return FALSE; // Propagate.
}
// Our content widget got a click.
- if (event->window != window_->window &&
- gdk_window_get_toplevel(event->window) == window_->window) {
+ if (event->window != gdk_window &&
+ gdk_window_get_toplevel(event->window) == gdk_window) {
return FALSE;
}
« no previous file with comments | « chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.cc ('k') | chrome/browser/ui/gtk/chrome_gtk_frame.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698