| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/bounds_animator.h" | 5 #include "ui/views/animation/bounds_animator.h" |
| 6 | 6 |
| 7 #include "base/macros.h" |
| 7 #include "testing/gtest/include/gtest/gtest.h" | 8 #include "testing/gtest/include/gtest/gtest.h" |
| 8 #include "ui/gfx/animation/slide_animation.h" | 9 #include "ui/gfx/animation/slide_animation.h" |
| 9 #include "ui/gfx/animation/test_animation_delegate.h" | 10 #include "ui/gfx/animation/test_animation_delegate.h" |
| 10 #include "ui/views/view.h" | 11 #include "ui/views/view.h" |
| 11 | 12 |
| 12 using gfx::Animation; | 13 using gfx::Animation; |
| 13 using gfx::SlideAnimation; | 14 using gfx::SlideAnimation; |
| 14 using gfx::TestAnimationDelegate; | 15 using gfx::TestAnimationDelegate; |
| 15 | 16 |
| 16 namespace views { | 17 namespace views { |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 | 174 |
| 174 // Shouldn't be animating now. | 175 // Shouldn't be animating now. |
| 175 EXPECT_FALSE(animator()->IsAnimating()); | 176 EXPECT_FALSE(animator()->IsAnimating()); |
| 176 | 177 |
| 177 // Stopping should both cancel the delegate and delete it. | 178 // Stopping should both cancel the delegate and delete it. |
| 178 EXPECT_TRUE(OwnedDelegate::GetAndClearDeleted()); | 179 EXPECT_TRUE(OwnedDelegate::GetAndClearDeleted()); |
| 179 EXPECT_TRUE(OwnedDelegate::GetAndClearCanceled()); | 180 EXPECT_TRUE(OwnedDelegate::GetAndClearCanceled()); |
| 180 } | 181 } |
| 181 | 182 |
| 182 } // namespace views | 183 } // namespace views |
| OLD | NEW |