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

Unified Diff: chrome/browser/ui/gtk/bookmarks/bookmark_bar_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 | « no previous file | chrome/browser/ui/gtk/browser_window_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
diff --git a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
index 537ee5b425dd1e1d3e5cc6d2682de7f2c9a57455..671a9c360e89eba08521d62063f1c8cef880d5e0 100644
--- a/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
+++ b/chrome/browser/ui/gtk/bookmarks/bookmark_bar_gtk.cc
@@ -426,12 +426,12 @@ void BookmarkBarGtk::Show(BookmarkBar::State old_state,
// probably be improved.
if (bookmark_bar_state_ == BookmarkBar::DETACHED) {
if (theme_service_->UsingNativeTheme()) {
- if (GTK_WIDGET_REALIZED(event_box_->parent))
+ if (gtk_widget_get_realized(event_box_->parent))
gdk_window_lower(event_box_->parent->window);
- if (GTK_WIDGET_REALIZED(event_box_.get()))
+ if (gtk_widget_get_realized(event_box_.get()))
gdk_window_lower(event_box_->window);
} else { // Chromium theme mode.
- if (GTK_WIDGET_REALIZED(paint_box_)) {
+ if (gtk_widget_get_realized(paint_box_)) {
gdk_window_lower(paint_box_->window);
// The event box won't stay below its children's GdkWindows unless we
// toggle the above-child property here. If the event box doesn't stay
@@ -1395,9 +1395,9 @@ gboolean BookmarkBarGtk::OnEventBoxExpose(GtkWidget* widget,
GtkAllocation allocation;
gtk_widget_get_allocation(widget, &allocation);
- gfx::Rect area = GTK_WIDGET_NO_WINDOW(widget) ?
- gfx::Rect(allocation) :
- gfx::Rect(0, 0, allocation.width, allocation.height);
+ gfx::Rect area = gtk_widget_get_has_window(widget) ?
+ gfx::Rect(0, 0, allocation.width, allocation.height) :
+ gfx::Rect(allocation);
NtpBackgroundUtil::PaintBackgroundDetachedMode(theme_provider, &canvas,
area, tab_contents_size.height());
}
« no previous file with comments | « no previous file | chrome/browser/ui/gtk/browser_window_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698