content/browser/renderer_host/gtk_window_utils.cc - Issue 23460052: Move XID, XDisplay, GetXDisplay and a few other types to ui/gfx/x/x11_types.h

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: content/browser/renderer_host/gtk_window_utils.cc

Issue 23460052: Move XID, XDisplay, GetXDisplay and a few other types to ui/gfx/x/x11_types.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: sdf Created 7 years, 3 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 | « content/browser/renderer_host/backing_store_gtk.cc ('k') | content/browser/renderer_host/web_input_event_aura_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/gtk_window_utils.cc

diff --git a/content/browser/renderer_host/gtk_window_utils.cc b/content/browser/renderer_host/gtk_window_utils.cc

index 28f8460e64df772d9c92123537dff775a49a53f5..f05cdca3b66c09434c4509a82603dce46a6923d5 100644

--- a/content/browser/renderer_host/gtk_window_utils.cc

+++ b/content/browser/renderer_host/gtk_window_utils.cc

@@ -10,10 +10,11 @@

#include <vector>

+#include "third_party/WebKit/public/web/WebScreenInfo.h"

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

#include "ui/gfx/gtk_compat.h"

#include "ui/gfx/rect.h"

-#include "third_party/WebKit/public/web/WebScreenInfo.h"

+#include "ui/gfx/x/x11_types.h"

namespace content {

@@ -44,7 +45,7 @@ gfx::Rect GetWorkArea(Window window) {

property[start_index + 2], property[start_index + 3]);

}

-WebKit::WebScreenInfo GetScreenInfo(Display* display, int screenNumber) {

+WebKit::WebScreenInfo GetScreenInfo(XDisplay* display, int screenNumber) {

// XDisplayWidth() and XDisplayHeight() return cached values. To ensure that

// we return the correct dimensions after the screen is resized, query the

// root window's geometry each time.