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

Unified Diff: ui/aura/test/aura_test_helper.cc

Issue 2683033006: Move SetUseOverrideRedirectWindowByDefault() to //ui/base. (Closed)
Patch Set: Rename files. 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
Index: ui/aura/test/aura_test_helper.cc
diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc
index 1d0dc9b297f0599fd835c2896822d262471b3a59..eac8dbf6e562bec5a6ad983c01b5ff6fc56330a1 100644
--- a/ui/aura/test/aura_test_helper.cc
+++ b/ui/aura/test/aura_test_helper.cc
@@ -26,6 +26,7 @@
#include "ui/aura/window_port_local.h"
#include "ui/base/ime/input_method_factory.h"
#include "ui/base/ime/input_method_initializer.h"
+#include "ui/base/platform_window_defaults.h"
#include "ui/compositor/compositor.h"
#include "ui/compositor/layer_animator.h"
#include "ui/compositor/scoped_animation_duration_scale_mode.h"
@@ -33,7 +34,6 @@
#include "ui/wm/core/wm_state.h"
#if defined(USE_X11)
-#include "ui/aura/window_tree_host_x11.h"
#include "ui/base/x/x11_util.h" // nogncheck
#endif
@@ -51,9 +51,7 @@ AuraTestHelper::AuraTestHelper(base::MessageLoopForUI* message_loop)
// Disable animations during tests.
zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
-#if defined(USE_X11)
- test::SetUseOverrideRedirectWindowByDefault(true);
-#endif
+ ui::test::SetUseOverrideRedirectWindowByDefault(true);
InitializeAuraEventGeneratorDelegate();
}

Powered by Google App Engine
This is Rietveld 408576698