| Index: chrome/browser/idle_query_linux.cc
|
| diff --git a/chrome/browser/idle_query_linux.cc b/chrome/browser/idle_query_linux.cc
|
| index 41d4abaaa86dc1cbaaf4a611874c64a61886aff4..dfa2fb5fa37333bb93646078f16c9e92ee3e634b 100644
|
| --- a/chrome/browser/idle_query_linux.cc
|
| +++ b/chrome/browser/idle_query_linux.cc
|
| @@ -4,8 +4,8 @@
|
|
|
| #include "chrome/browser/idle_query_linux.h"
|
|
|
| -#include <X11/Xlib.h>
|
| #include <X11/extensions/scrnsaver.h>
|
| +#include "ui/base/x/x11_util.h"
|
|
|
| namespace browser {
|
|
|
| @@ -14,8 +14,8 @@ class IdleData {
|
| IdleData() {
|
| int event_base;
|
| int error_base;
|
| - display = XOpenDisplay(NULL);
|
| - if (XScreenSaverQueryExtension(display, &event_base, &error_base)) {
|
| + if (XScreenSaverQueryExtension(ui::GetXDisplay(), &event_base,
|
| + &error_base)) {
|
| mit_info = XScreenSaverAllocInfo();
|
| } else {
|
| mit_info = NULL;
|
| @@ -23,16 +23,11 @@ class IdleData {
|
| }
|
|
|
| ~IdleData() {
|
| - if (display) {
|
| - XCloseDisplay(display);
|
| - display = NULL;
|
| - }
|
| if (mit_info)
|
| XFree(mit_info);
|
| }
|
|
|
| XScreenSaverInfo *mit_info;
|
| - Display *display;
|
| };
|
|
|
| IdleQueryLinux::IdleQueryLinux() : idle_data_(new IdleData()) {}
|
| @@ -40,11 +35,11 @@ IdleQueryLinux::IdleQueryLinux() : idle_data_(new IdleData()) {}
|
| IdleQueryLinux::~IdleQueryLinux() {}
|
|
|
| int IdleQueryLinux::IdleTime() {
|
| - if (!idle_data_->mit_info || !idle_data_->display)
|
| + if (!idle_data_->mit_info)
|
| return 0;
|
|
|
| - if (XScreenSaverQueryInfo(idle_data_->display,
|
| - RootWindow(idle_data_->display, 0),
|
| + if (XScreenSaverQueryInfo(ui::GetXDisplay(),
|
| + RootWindow(ui::GetXDisplay(), 0),
|
| idle_data_->mit_info)) {
|
| return (idle_data_->mit_info->idle) / 1000;
|
| } else {
|
|
|