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

Unified Diff: chrome/browser/ui/gtk/rounded_window.cc

Issue 8952002: GTK: Remove more deprecated stuff. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix spaces Created 9 years 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/gtk_util.cc ('k') | chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/rounded_window.cc
diff --git a/chrome/browser/ui/gtk/rounded_window.cc b/chrome/browser/ui/gtk/rounded_window.cc
index ca72c38742630f0633ba419e6134a8b30e1432e5..4fb2220d2f2b4a6f32ec857037da3245ab091233 100644
--- a/chrome/browser/ui/gtk/rounded_window.cc
+++ b/chrome/browser/ui/gtk/rounded_window.cc
@@ -205,10 +205,13 @@ gboolean OnRoundedWindowExpose(GtkWidget* widget,
RoundedWindowData* data = static_cast<RoundedWindowData*>(
g_object_get_data(G_OBJECT(widget), kRoundedData));
- if (data->expected_width != widget->allocation.width ||
- data->expected_height != widget->allocation.height) {
- data->expected_width = widget->allocation.width;
- data->expected_height = widget->allocation.height;
+ GtkAllocation allocation;
+ gtk_widget_get_allocation(widget, &allocation);
+
+ if (data->expected_width != allocation.width ||
+ data->expected_height != allocation.height) {
+ data->expected_width = allocation.width;
+ data->expected_height = allocation.height;
// We need to update the shape of the status bubble whenever our GDK
// window changes shape.
@@ -217,7 +220,8 @@ gboolean OnRoundedWindowExpose(GtkWidget* widget,
GdkRegion* mask_region = gdk_region_polygon(&mask_points[0],
mask_points.size(),
GDK_EVEN_ODD_RULE);
- gdk_window_shape_combine_region(widget->window, mask_region, 0, 0);
+ gdk_window_shape_combine_region(gtk_widget_get_window(widget),
+ mask_region, 0, 0);
gdk_region_destroy(mask_region);
}
« no previous file with comments | « chrome/browser/ui/gtk/gtk_util.cc ('k') | chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698