| Index: services/ui/service.cc
|
| diff --git a/services/ui/service.cc b/services/ui/service.cc
|
| index 5e9fab6dc5e9bb9ab30c6782397e1d494f8788d3..d8e87cb4dc142489c69186368b985562eea1a31b 100644
|
| --- a/services/ui/service.cc
|
| +++ b/services/ui/service.cc
|
| @@ -40,6 +40,7 @@
|
| #include "services/ui/ws/window_tree_binding.h"
|
| #include "services/ui/ws/window_tree_factory.h"
|
| #include "services/ui/ws/window_tree_host_factory.h"
|
| +#include "ui/base/platform_window_defaults.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "ui/base/ui_base_paths.h"
|
| #include "ui/events/event_switches.h"
|
| @@ -148,11 +149,12 @@ void Service::OnStart() {
|
| switches::kUseTestConfig);
|
| #if defined(USE_X11)
|
| XInitThreads();
|
| - if (test_config_)
|
| - ui::test::SetUseOverrideRedirectWindowByDefault(true);
|
| ui::SetDefaultX11ErrorHandlers();
|
| #endif
|
|
|
| + if (test_config_)
|
| + ui::test::SetUseOverrideRedirectWindowByDefault(true);
|
| +
|
| InitializeResources(context()->connector());
|
|
|
| #if defined(USE_OZONE)
|
|
|