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

Side by Side Diff: ui/base/animation/animation_container_unittest.cc

Issue 6154001: Move animation code to new ui/base/animation directory.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 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 "app/animation_container.h"
6 #include "app/animation_container_observer.h"
7 #include "app/linear_animation.h"
8 #include "app/test_animation_delegate.h"
9 #include "base/scoped_ptr.h" 5 #include "base/scoped_ptr.h"
10 #include "testing/gmock/include/gmock/gmock.h" 6 #include "testing/gmock/include/gmock/gmock.h"
11 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 #include "ui/base/animation/animation_container.h"
9 #include "ui/base/animation/animation_container_observer.h"
10 #include "ui/base/animation/linear_animation.h"
11 #include "ui/base/animation/test_animation_delegate.h"
12 12
13 using testing::AtLeast; 13 using testing::AtLeast;
14 14
15 namespace ui {
16
15 namespace { 17 namespace {
16 18
17 class MockObserver : public AnimationContainerObserver { 19 class MockObserver : public AnimationContainerObserver {
18 public: 20 public:
19 MockObserver() {} 21 MockObserver() {}
20 22
21 MOCK_METHOD1(AnimationContainerProgressed, void(AnimationContainer*)); 23 MOCK_METHOD1(AnimationContainerProgressed, void(AnimationContainer*));
22 MOCK_METHOD1(AnimationContainerEmpty, void(AnimationContainer*)); 24 MOCK_METHOD1(AnimationContainerEmpty, void(AnimationContainer*));
23 25
24 private: 26 private:
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 MessageLoop::current()->Run(); 115 MessageLoop::current()->Run();
114 116
115 // The timer should have finished. 117 // The timer should have finished.
116 EXPECT_TRUE(delegate1.finished()); 118 EXPECT_TRUE(delegate1.finished());
117 119
118 // And the container should no longer be running. 120 // And the container should no longer be running.
119 EXPECT_FALSE(container->is_running()); 121 EXPECT_FALSE(container->is_running());
120 122
121 container->set_observer(NULL); 123 container->set_observer(NULL);
122 } 124 }
125
126 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/animation/animation_container_observer.h ('k') | ui/base/animation/animation_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698