diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 17:41:39 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 17:41:39 +0000 |
| commit | c4eb2947a68a9ceb064f789ded6f06ce8a5b0497 (patch) | |
| tree | 6eccf6da9f8557688cd9b6f0c2de860b81824d89 /content/browser/renderer_host/gtk_window_utils.cc | |
| parent | f746ee6b3e71c5688a1f774faa0602799c7118d6 (diff) | |
| download | chromium_src-c4eb2947a68a9ceb064f789ded6f06ce8a5b0497.zip chromium_src-c4eb2947a68a9ceb064f789ded6f06ce8a5b0497.tar.gz chromium_src-c4eb2947a68a9ceb064f789ded6f06ce8a5b0497.tar.bz2 | |
Move XID, XDisplay, GetXDisplay and a few other types to ui/gfx/x/x11_types.h
This is to break a dependency on ui/base from ui/compositor.
R=sky@chromium.org
TBR=sky@chromium.org
BUG=none
Review URL: https://codereview.chromium.org/23460052
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224419 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/gtk_window_utils.cc')
| -rw-r--r-- | content/browser/renderer_host/gtk_window_utils.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/renderer_host/gtk_window_utils.cc b/content/browser/renderer_host/gtk_window_utils.cc index 28f8460..f05cdca 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. |