diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 05:31:15 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-30 05:31:15 +0000 |
| commit | f0785c60a1bc5797c74c69274ff6abe499949bbf (patch) | |
| tree | f2a6f6b6ccb4246a99a5458ae0643fe5e36dbb89 /media/base/user_input_monitor_linux.cc | |
| parent | be5bffb65d974f917b26289cf581e7ec89234c30 (diff) | |
| download | chromium_src-f0785c60a1bc5797c74c69274ff6abe499949bbf.zip chromium_src-f0785c60a1bc5797c74c69274ff6abe499949bbf.tar.gz chromium_src-f0785c60a1bc5797c74c69274ff6abe499949bbf.tar.bz2 | |
linux_aura: Add a "--display=" switch like GTK+ has.
Looking through crash output, we should do the right thing when chrome is run like this: "DISPLAY= chrome --display=:0.0"
BUG=376971
Review URL: https://codereview.chromium.org/297983005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/user_input_monitor_linux.cc')
| -rw-r--r-- | media/base/user_input_monitor_linux.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/media/base/user_input_monitor_linux.cc b/media/base/user_input_monitor_linux.cc index 4b40c83..b92cdda 100644 --- a/media/base/user_input_monitor_linux.cc +++ b/media/base/user_input_monitor_linux.cc @@ -22,6 +22,7 @@ #include "media/base/keyboard_event_counter.h" #include "third_party/skia/include/core/SkPoint.h" #include "ui/events/keycodes/keyboard_code_conversion_x.h" +#include "ui/gfx/x/x11_types.h" // These includes need to be later than dictated by the style guide due to // Xlib header pollution, specifically the min, max, and Status macros. @@ -147,10 +148,10 @@ void UserInputMonitorLinuxCore::StartMonitor(EventType type) { // them with something like the following: // XOpenDisplay(DisplayString(display)); if (!x_control_display_) - x_control_display_ = XOpenDisplay(NULL); + x_control_display_ = gfx::OpenNewXDisplay(); if (!x_record_display_) - x_record_display_ = XOpenDisplay(NULL); + x_record_display_ = gfx::OpenNewXDisplay(); if (!x_control_display_ || !x_record_display_) { LOG(ERROR) << "Couldn't open X display"; |