Index: gpu/ipc/service/gpu_watchdog_thread.cc |
diff --git a/gpu/ipc/service/gpu_watchdog_thread.cc b/gpu/ipc/service/gpu_watchdog_thread.cc |
index 4006edc693ccd92780dfc8c2bce5d0b4bbccda20..32152351c8badc934afccba3738c9ecad87c8536 100644 |
--- a/gpu/ipc/service/gpu_watchdog_thread.cc |
+++ b/gpu/ipc/service/gpu_watchdog_thread.cc |
@@ -31,6 +31,8 @@ |
#if defined(USE_X11) |
#include <X11/Xatom.h> |
#include <X11/Xlib.h> |
+ |
+#include "ui/base/x/x11_util.h" // nogncheck |
#endif |
namespace gpu { |
@@ -428,7 +430,7 @@ void GpuWatchdogThread::SetupXServer() { |
display_ = XOpenDisplay(NULL); |
window_ = XCreateWindow(display_, DefaultRootWindow(display_), 0, 0, 1, 1, 0, |
CopyFromParent, InputOutput, CopyFromParent, 0, NULL); |
- atom_ = XInternAtom(display_, "CHECK", False); |
sadrul
2017/06/01 20:45:30
I think we need to keep this. Different displays.
Tom Anderson
2017/06/01 21:20:42
Done. (but for the record, I think atom IDs are t
|
+ atom_ = ui::GetAtom("CHECK"); |
host_tty_ = GetActiveTTY(); |
} |