| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/gfx/animation/animation_container.h" | 5 #include "ui/gfx/animation/animation_container.h" |
| 6 | 6 |
| 7 #include "base/macros.h" |
| 7 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 8 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 9 #include "ui/gfx/animation/animation_container_observer.h" | 10 #include "ui/gfx/animation/animation_container_observer.h" |
| 10 #include "ui/gfx/animation/linear_animation.h" | 11 #include "ui/gfx/animation/linear_animation.h" |
| 11 #include "ui/gfx/animation/test_animation_delegate.h" | 12 #include "ui/gfx/animation/test_animation_delegate.h" |
| 12 | 13 |
| 13 namespace gfx { | 14 namespace gfx { |
| 14 | 15 |
| 15 namespace { | 16 namespace { |
| 16 | 17 |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 | 128 |
| 128 EXPECT_TRUE(observer.empty()); | 129 EXPECT_TRUE(observer.empty()); |
| 129 | 130 |
| 130 // And the container should no longer be running. | 131 // And the container should no longer be running. |
| 131 EXPECT_FALSE(container->is_running()); | 132 EXPECT_FALSE(container->is_running()); |
| 132 | 133 |
| 133 container->set_observer(NULL); | 134 container->set_observer(NULL); |
| 134 } | 135 } |
| 135 | 136 |
| 136 } // namespace gfx | 137 } // namespace gfx |
| OLD | NEW |