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 "ash/test/launcher_view_test_api.h" | 5 #include "ash/test/launcher_view_test_api.h" |
6 | 6 |
7 #include "ash/launcher/launcher_button.h" | 7 #include "ash/launcher/launcher_button.h" |
8 #include "ash/launcher/launcher_view.h" | 8 #include "ash/launcher/launcher_view.h" |
9 #include "ash/launcher/overflow_button.h" | 9 #include "ash/launcher/overflow_button.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
11 #include "ui/views/animation/bounds_animator.h" | 11 #include "ui/views/animation/bounds_animator.h" |
12 #include "ui/views/controls/button/image_button.h" | |
13 #include "ui/views/view_model.h" | 12 #include "ui/views/view_model.h" |
14 | 13 |
15 namespace { | 14 namespace { |
16 | 15 |
17 // A class used to wait for animations. | 16 // A class used to wait for animations. |
18 class TestAPIAnimationObserver : public views::BoundsAnimatorObserver { | 17 class TestAPIAnimationObserver : public views::BoundsAnimatorObserver { |
19 public: | 18 public: |
20 TestAPIAnimationObserver() {} | 19 TestAPIAnimationObserver() {} |
21 virtual ~TestAPIAnimationObserver() {} | 20 virtual ~TestAPIAnimationObserver() {} |
22 | 21 |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 | 84 |
86 // This nested loop will quit when TestAPIAnimationObserver's | 85 // This nested loop will quit when TestAPIAnimationObserver's |
87 // OnBoundsAnimatorDone is called. | 86 // OnBoundsAnimatorDone is called. |
88 MessageLoop::current()->Run(); | 87 MessageLoop::current()->Run(); |
89 | 88 |
90 launcher_view_->bounds_animator_->RemoveObserver(observer.get()); | 89 launcher_view_->bounds_animator_->RemoveObserver(observer.get()); |
91 } | 90 } |
92 | 91 |
93 } // namespace test | 92 } // namespace test |
94 } // namespace ash | 93 } // namespace ash |
OLD | NEW |