| Index: ui/base/x/x11_util.cc
|
| diff --git a/ui/base/x/x11_util.cc b/ui/base/x/x11_util.cc
|
| index db9af3ce741f6e1342726fe1ef11cf4f291f8f3e..e8b301d55c9e2c0234610d34fede22800ced5299 100644
|
| --- a/ui/base/x/x11_util.cc
|
| +++ b/ui/base/x/x11_util.cc
|
| @@ -8,12 +8,12 @@
|
|
|
| #include "ui/base/x/x11_util.h"
|
|
|
| -#include <X11/Xcursor/Xcursor.h>
|
| -#include <X11/extensions/XInput2.h>
|
| -#include <X11/extensions/shape.h>
|
| #include <ctype.h>
|
| #include <sys/ipc.h>
|
| #include <sys/shm.h>
|
| +#include <X11/extensions/shape.h>
|
| +#include <X11/extensions/XInput2.h>
|
| +#include <X11/Xcursor/Xcursor.h>
|
|
|
| #include <list>
|
| #include <map>
|
| @@ -22,17 +22,20 @@
|
| #include <vector>
|
|
|
| #include "base/bind.h"
|
| +#include "base/location.h"
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| #include "base/memory/singleton.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/metrics/histogram.h"
|
| +#include "base/single_thread_task_runner.h"
|
| #include "base/stl_util.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/stringprintf.h"
|
| #include "base/sys_byteorder.h"
|
| #include "base/threading/thread.h"
|
| +#include "base/threading/thread_task_runner_handle.h"
|
| #include "base/trace_event/trace_event.h"
|
| #include "build/build_config.h"
|
| #include "skia/ext/image_operations.h"
|
| @@ -71,7 +74,7 @@ namespace {
|
|
|
| int DefaultX11ErrorHandler(XDisplay* d, XErrorEvent* e) {
|
| if (base::MessageLoop::current()) {
|
| - base::MessageLoop::current()->PostTask(
|
| + base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| FROM_HERE, base::Bind(&LogErrorEventDescription, d, *e));
|
| } else {
|
| LOG(ERROR)
|
|
|