chrome/browser/idle_query_x11.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: chrome/browser/idle_query_x11.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

Index: chrome/browser/idle_query_x11.cc

diff --git a/chrome/browser/idle_query_x11.cc b/chrome/browser/idle_query_x11.cc

index da81e360f7f8cff03d45ccfb1fd8a89da8e2080c..845ec5b6a5117c02d28c812092b1008dc0412447 100644

--- a/chrome/browser/idle_query_x11.cc

+++ b/chrome/browser/idle_query_x11.cc

@@ -5,7 +5,7 @@

#include "chrome/browser/idle_query_x11.h"

#include <X11/extensions/scrnsaver.h>

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

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

namespace chrome {

@@ -14,7 +14,7 @@ class IdleData {

IdleData() {

int event_base;

int error_base;

- if (XScreenSaverQueryExtension(ui::GetXDisplay(), &event_base,

+ if (XScreenSaverQueryExtension(gfx::GetXDisplay(), &event_base,

&error_base)) {

mit_info = XScreenSaverAllocInfo();

} else {

@@ -38,8 +38,8 @@ int IdleQueryX11::IdleTime() {

if (!idle_data_->mit_info)

return 0;

- if (XScreenSaverQueryInfo(ui::GetXDisplay(),

- RootWindow(ui::GetXDisplay(), 0),

+ if (XScreenSaverQueryInfo(gfx::GetXDisplay(),

+ RootWindow(gfx::GetXDisplay(), 0),

idle_data_->mit_info)) {

return (idle_data_->mit_info->idle) / 1000;

} else {

« no previous file with comments | « chrome/browser/fullscreen_gtk.cc ('k') | chrome/browser/ui/ash/event_rewriter.cc » ('j') | no next file with comments »