| 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;
|
|
|