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

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

Issue 9222018: reland -- Disable animations during aura tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 11 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 | « ui/aura/root_window.cc ('k') | ui/aura/window_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/aura_test_base.cc
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc
index 70d33f53cf62995ff0793defcdbca234929f85ec..3e1e95f4db1fd548842f54760af148b930204b2e 100644
--- a/ui/aura/test/aura_test_base.cc
+++ b/ui/aura/test/aura_test_base.cc
@@ -9,6 +9,7 @@
#endif
#include "ui/aura/root_window.h"
+#include "ui/gfx/compositor/layer_animator.h"
namespace aura {
namespace test {
@@ -22,6 +23,9 @@ AuraTestBase::AuraTestBase()
RootWindow::GetInstance()->Show();
RootWindow::GetInstance()->SetHostSize(gfx::Size(600, 600));
+
+ // Disable animations during tests.
+ ui::LayerAnimator::set_disable_animations_for_test(true);
}
AuraTestBase::~AuraTestBase() {
« no previous file with comments | « ui/aura/root_window.cc ('k') | ui/aura/window_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698