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

Unified Diff: ui/base/x/x11_error_tracker.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: 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: ui/base/x/x11_error_tracker.cc
diff --git a/ui/base/x/x11_error_tracker.cc b/ui/base/x/x11_error_tracker.cc
index 9b8119b2de7c58a6519db65ce18d0419cf5cb673..22bc798321b743eb58f71e040d3a7ed9f90a2f35 100644
--- a/ui/base/x/x11_error_tracker.cc
+++ b/ui/base/x/x11_error_tracker.cc
@@ -10,7 +10,7 @@ namespace {
unsigned char g_x11_error_code = 0;
-int X11ErrorHandler(Display* display, XErrorEvent* error) {
+int X11ErrorHandler(XDisplay* display, XErrorEvent* error) {
g_x11_error_code = error->error_code;
return 0;
}
@@ -28,7 +28,7 @@ X11ErrorTracker::~X11ErrorTracker() {
}
bool X11ErrorTracker::FoundNewError() {
- XSync(GetXDisplay(), False);
+ XSync(gfx::GetXDisplay(), False);
unsigned char error = g_x11_error_code;
g_x11_error_code = 0;
return error != 0;
« no previous file with comments | « ui/base/x/selection_utils.cc ('k') | ui/base/x/x11_util.h » ('j') | ui/base/x/x11_util.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698