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