Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(94)

Unified Diff: services/ui/service.cc

Issue 2683033006: Move SetUseOverrideRedirectWindowByDefault() to //ui/base. (Closed)
Patch Set: g_use_test_config. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/test/browser_test_base.cc ('k') | ui/aura/test/aura_test_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/service.cc
diff --git a/services/ui/service.cc b/services/ui/service.cc
index 5e9fab6dc5e9bb9ab30c6782397e1d494f8788d3..34f4803d4984e997f8e53951e4f666b7319bb259 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::EnableTestConfigForPlatformWindows();
+
InitializeResources(context()->connector());
#if defined(USE_OZONE)
« no previous file with comments | « content/public/test/browser_test_base.cc ('k') | ui/aura/test/aura_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698