ash/wm/workspace_controller_unittest.cc - Issue 420013002: Introduce NON_ZERO_DURATION for animation unit tests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/workspace_controller_unittest.cc

Issue 420013002: Introduce NON_ZERO_DURATION for animation unit tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: content_unittests Created 6 years, 5 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:

Index: ash/wm/workspace_controller_unittest.cc

diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc

index e00390eff0fef814150de98715367e14d13db465..77f001f1af1d0a4e4699a9335beab0ec9179f2db 100644

--- a/ash/wm/workspace_controller_unittest.cc

+++ b/ash/wm/workspace_controller_unittest.cc

@@ -1203,8 +1203,8 @@ TEST_F(WorkspaceControllerTest, NormToMaxToNormRepositionsRemaining) {

// Test that animations are triggered.

TEST_F(WorkspaceControllerTest, AnimatedNormToMaxToNormRepositionsRemaining) {

- ui::ScopedAnimationDurationScaleMode normal_duration_mode(

- ui::ScopedAnimationDurationScaleMode::NORMAL_DURATION);

+ ui::ScopedAnimationDurationScaleMode test_duration_mode(

+ ui::ScopedAnimationDurationScaleMode::NON_ZERO_DURATION);

scoped_ptr<aura::Window> window1(CreateTestWindowInShellWithId(0));

window1->Hide();

window1->SetBounds(gfx::Rect(16, 32, 640, 320));