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

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

Issue 1924663007: Expand the Material Design hover as it fades out when a ripple is triggered. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 years, 7 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
« no previous file with comments | « ui/views/animation/ink_drop_hover.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "ui/views/animation/ink_drop_hover.h" 5 #include "ui/views/animation/ink_drop_hover.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "ui/compositor/scoped_animation_duration_scale_mode.h" 10 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 scoped_ptr<InkDropHover> ink_drop_hover = CreateInkDropHover(); 44 scoped_ptr<InkDropHover> ink_drop_hover = CreateInkDropHover();
45 EXPECT_FALSE(ink_drop_hover->IsFadingInOrVisible()); 45 EXPECT_FALSE(ink_drop_hover->IsFadingInOrVisible());
46 } 46 }
47 47
48 TEST_F(InkDropHoverTest, IsHoveredStateTransitions) { 48 TEST_F(InkDropHoverTest, IsHoveredStateTransitions) {
49 scoped_ptr<InkDropHover> ink_drop_hover = CreateInkDropHover(); 49 scoped_ptr<InkDropHover> ink_drop_hover = CreateInkDropHover();
50 50
51 ink_drop_hover->FadeIn(base::TimeDelta::FromMilliseconds(0)); 51 ink_drop_hover->FadeIn(base::TimeDelta::FromMilliseconds(0));
52 EXPECT_TRUE(ink_drop_hover->IsFadingInOrVisible()); 52 EXPECT_TRUE(ink_drop_hover->IsFadingInOrVisible());
53 53
54 ink_drop_hover->FadeOut(base::TimeDelta::FromMilliseconds(0)); 54 ink_drop_hover->FadeOut(base::TimeDelta::FromMilliseconds(0),
55 false /* explode */);
55 EXPECT_FALSE(ink_drop_hover->IsFadingInOrVisible()); 56 EXPECT_FALSE(ink_drop_hover->IsFadingInOrVisible());
56 } 57 }
57 58
58 } // namespace test 59 } // namespace test
59 } // namespace views 60 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/animation/ink_drop_hover.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698