Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(390)

Unified Diff: media/base/user_input_monitor_linux.cc

Issue 297983005: linux_aura: Bail early if we can't connect to the X11 server. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to TOT and resolve conflicts. Created 6 years, 7 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
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | ui/gfx/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/user_input_monitor_linux.cc
diff --git a/media/base/user_input_monitor_linux.cc b/media/base/user_input_monitor_linux.cc
index 4b40c8310beb7de1fdbeb61f5fa705231e794157..b92cdda0325f21534ba13e9f820f12e6bd876680 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";
« no previous file with comments | « content/browser/gpu/gpu_process_host.cc ('k') | ui/gfx/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698