| Index: ui/views/test/ui_controls_factory_desktop_aurax11.cc
|
| diff --git a/ui/views/test/ui_controls_factory_desktop_aurax11.cc b/ui/views/test/ui_controls_factory_desktop_aurax11.cc
|
| index a8467991de959a56f92b7c6e8c6a57dc86093e82..9e41c3213cd132a049e791242dcf0a50c8a820c0 100644
|
| --- a/ui/views/test/ui_controls_factory_desktop_aurax11.cc
|
| +++ b/ui/views/test/ui_controls_factory_desktop_aurax11.cc
|
| @@ -21,6 +21,7 @@
|
| #include "ui/compositor/dip_util.h"
|
| #include "ui/events/keycodes/keyboard_code_conversion_x.h"
|
| #include "ui/events/test/platform_event_waiter.h"
|
| +#include "ui/gfx/x/x11_connection.h"
|
| #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
|
|
|
| namespace views {
|
| @@ -280,8 +281,9 @@ class UIControlsDesktopX11 : public UIControlsAura {
|
| } // namespace
|
|
|
| UIControlsAura* CreateUIControlsDesktopAura() {
|
| - // The constructor of UIControlsDesktopX11 needs XInitThreads to be called.
|
| - XInitThreads();
|
| + // The constructor of UIControlsDesktopX11 needs X11 connection to be
|
| + // initialized.
|
| + gfx::InitializeX11();
|
| return new UIControlsDesktopX11();
|
| }
|
|
|
|
|