| Index: base/message_loop/message_pump_aurax11.cc
|
| diff --git a/base/message_loop/message_pump_aurax11.cc b/base/message_loop/message_pump_aurax11.cc
|
| index 7f60628592ad29ce2ec6af8f6d9fb77d50b0c909..1f91a0e359ac3f23c38bda78a3924bcf407938f8 100644
|
| --- a/base/message_loop/message_pump_aurax11.cc
|
| +++ b/base/message_loop/message_pump_aurax11.cc
|
| @@ -139,6 +139,13 @@ MessagePumpAuraX11::MessagePumpAuraX11() : MessagePumpGlib(),
|
| x_root_window_ = DefaultRootWindow(g_xdisplay);
|
| }
|
|
|
| +MessagePumpAuraX11::~MessagePumpAuraX11() {
|
| + g_source_destroy(x_source_);
|
| + g_source_unref(x_source_);
|
| + XCloseDisplay(g_xdisplay);
|
| + g_xdisplay = NULL;
|
| +}
|
| +
|
| // static
|
| Display* MessagePumpAuraX11::GetDefaultXDisplay() {
|
| if (!g_xdisplay)
|
| @@ -211,13 +218,6 @@ void MessagePumpAuraX11::BlockUntilWindowMapped(unsigned long xid) {
|
| } while (event.type != MapNotify);
|
| }
|
|
|
| -MessagePumpAuraX11::~MessagePumpAuraX11() {
|
| - g_source_destroy(x_source_);
|
| - g_source_unref(x_source_);
|
| - XCloseDisplay(g_xdisplay);
|
| - g_xdisplay = NULL;
|
| -}
|
| -
|
| void MessagePumpAuraX11::InitXSource() {
|
| // CHECKs are to help track down crbug.com/113106.
|
| CHECK(!x_source_);
|
|
|