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

Unified Diff: chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc

Issue 8897006: GTK: Remove deprecated methods and replace them with the new standard calls. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Oh, that's what the conflict was. Remove double gtk/gtk.h 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/status_icons/status_icon_gtk.cc ('k') | ui/base/gtk/gtk_compat.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
diff --git a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
index 3888294ee3a5dfaf216531dec410ed830a726c3a..5884cb1c49436809114bc88f66dc2866a74ea82e 100644
--- a/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/tab_strip_gtk.cc
@@ -4,8 +4,8 @@
#include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h"
-#include <algorithm>
#include <gtk/gtk.h>
+#include <algorithm>
#include "base/bind.h"
#include "base/i18n/rtl.h"
@@ -929,9 +929,11 @@ gfx::Point TabStripGtk::GetTabStripOriginForWidget(GtkWidget* target) {
NOTREACHED();
}
}
- if (GTK_WIDGET_NO_WINDOW(target)) {
- x += target->allocation.x;
- y += target->allocation.y;
+ if (!gtk_widget_get_has_window(target)) {
+ GtkAllocation allocation;
+ gtk_widget_get_allocation(target, &allocation);
+ x += allocation.x;
+ y += allocation.y;
}
return gfx::Point(x, y);
}
« no previous file with comments | « chrome/browser/ui/gtk/status_icons/status_icon_gtk.cc ('k') | ui/base/gtk/gtk_compat.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698