ui/base/gtk/gtk_windowing.cc - Issue 8588068: GTK: Create the start of a compatibility header wrapping deprecated methods.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/base/gtk/gtk_windowing.cc

Issue 8588068: GTK: Create the start of a compatibility header wrapping deprecated methods. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Rebase to ToT and remove views/ cleanups. 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: ui/base/gtk/gtk_windowing.cc

diff --git a/ui/base/gtk/gtk_windowing.cc b/ui/base/gtk/gtk_windowing.cc

index 7f26b84442040c6a5a06b82f21f27441bff972c6..4ca4a1d2786b583f26d15bced0ff1752a3513a0f 100644

--- a/ui/base/gtk/gtk_windowing.cc

+++ b/ui/base/gtk/gtk_windowing.cc

@@ -7,15 +7,16 @@

#include <gdk/gdkx.h>

#include "base/logging.h"

+#include "ui/base/gtk/gtk_compat.h"

#include "ui/base/x/x11_util.h"

namespace ui {

void StackPopupWindow(GtkWidget* popup, GtkWidget* toplevel) {

- DCHECK(GTK_IS_WINDOW(popup) && GTK_WIDGET_TOPLEVEL(popup) &&

- GTK_WIDGET_REALIZED(popup));

- DCHECK(GTK_IS_WINDOW(toplevel) && GTK_WIDGET_TOPLEVEL(toplevel) &&

- GTK_WIDGET_REALIZED(toplevel));

+ DCHECK(GTK_IS_WINDOW(popup) && gtk_widget_is_toplevel(popup) &&

+ gtk_widget_get_realized(popup));

+ DCHECK(GTK_IS_WINDOW(toplevel) && gtk_widget_is_toplevel(toplevel) &&

+ gtk_widget_get_realized(toplevel));

// Stack the |popup| window directly above the |toplevel| window.

// The popup window is a direct child of the root window, so we need to

« no previous file with comments | « ui/base/gtk/gtk_floating_container.cc ('k') | ui/gfx/gtk_native_view_id_manager.cc » ('j') | no next file with comments »