ui/views/animation/ink_drop_animation_controller_factory_unittest.cc - Issue 1495753002: Make the material design ripple effect more visible on a quick action (single click or single tap)

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ui/views/animation/ink_drop_animation_controller_factory_unittest.cc

Issue 1495753002: Make the material design ripple effect more visible on a quick action (single click or single tap) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added tests and addressed comments from previous patch sets. Created 4 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 unified diff | Download patch

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "base/macros.h"	5 #include "base/macros.h"

6 #include "base/memory/scoped_ptr.h"	6 #include "base/memory/scoped_ptr.h"

7 #include "base/test/test_mock_time_task_runner.h"	7 #include "base/test/test_mock_time_task_runner.h"

8 #include "base/test/test_simple_task_runner.h"

9 #include "base/thread_task_runner_handle.h"	8 #include "base/thread_task_runner_handle.h"

10 #include "base/timer/timer.h"	9 #include "base/timer/timer.h"

11 #include "testing/gtest/include/gtest/gtest.h"	10 #include "testing/gtest/include/gtest/gtest.h"

12 #include "ui/base/material_design/material_design_controller.h"	11 #include "ui/base/material_design/material_design_controller.h"

13 #include "ui/base/test/material_design_controller_test_api.h"	12 #include "ui/base/test/material_design_controller_test_api.h"

14 #include "ui/compositor/scoped_animation_duration_scale_mode.h"	13 #include "ui/compositor/scoped_animation_duration_scale_mode.h"

15 #include "ui/views/animation/ink_drop_animation_controller.h"	14 #include "ui/views/animation/ink_drop_animation_controller.h"

16 #include "ui/views/animation/ink_drop_animation_controller_factory.h"	15 #include "ui/views/animation/ink_drop_animation_controller_factory.h"

17 #include "ui/views/animation/ink_drop_animation_controller_impl.h"	16 #include "ui/views/animation/ink_drop_animation_controller_impl.h"

18 #include "ui/views/animation/ink_drop_host.h"	17 #include "ui/views/animation/ink_drop_host.h"

(...skipping 143 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
162 ink_drop_animation_controller_->AnimateToState(InkDropState::ACTION_PENDING);	161 ink_drop_animation_controller_->AnimateToState(InkDropState::ACTION_PENDING);

163 ink_drop_animation_controller_->AnimateToState(	162 ink_drop_animation_controller_->AnimateToState(

164 InkDropState::SLOW_ACTION_PENDING);	163 InkDropState::SLOW_ACTION_PENDING);

165 ink_drop_animation_controller_->AnimateToState(InkDropState::ACTIVATED);	164 ink_drop_animation_controller_->AnimateToState(InkDropState::ACTIVATED);

166 ink_drop_animation_controller_->AnimateToState(InkDropState::DEACTIVATED);	165 ink_drop_animation_controller_->AnimateToState(InkDropState::DEACTIVATED);

167 EXPECT_EQ(InkDropState::HIDDEN,	166 EXPECT_EQ(InkDropState::HIDDEN,

168 ink_drop_animation_controller_->GetInkDropState());	167 ink_drop_animation_controller_->GetInkDropState());

169 }	168 }

170	169

171 } // namespace views	170 } // namespace views

OLD	NEW