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/shelf_view_test_api.h" | 5 #include "ash/test/shelf_view_test_api.h" |
6 | 6 |
7 #include "ash/common/shelf/overflow_button.h" | 7 #include "ash/shelf/overflow_button.h" |
8 #include "ash/common/shelf/shelf_button.h" | 8 #include "ash/shelf/shelf_button.h" |
9 #include "ash/common/shelf/shelf_constants.h" | 9 #include "ash/shelf/shelf_constants.h" |
10 #include "ash/common/shelf/shelf_model.h" | 10 #include "ash/shelf/shelf_model.h" |
11 #include "ash/common/shelf/shelf_view.h" | 11 #include "ash/shelf/shelf_view.h" |
12 #include "base/message_loop/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
13 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
14 #include "ui/views/animation/bounds_animator.h" | 14 #include "ui/views/animation/bounds_animator.h" |
15 #include "ui/views/controls/menu/menu_runner.h" | 15 #include "ui/views/controls/menu/menu_runner.h" |
16 #include "ui/views/view_model.h" | 16 #include "ui/views/view_model.h" |
17 | 17 |
18 namespace { | 18 namespace { |
19 | 19 |
20 // A class used to wait for animations. | 20 // A class used to wait for animations. |
21 class TestAPIAnimationObserver : public views::BoundsAnimatorObserver { | 21 class TestAPIAnimationObserver : public views::BoundsAnimatorObserver { |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
166 return shelf_view_->dragged_off_from_overflow_to_shelf_; | 166 return shelf_view_->dragged_off_from_overflow_to_shelf_; |
167 } | 167 } |
168 | 168 |
169 ShelfButtonPressedMetricTracker* | 169 ShelfButtonPressedMetricTracker* |
170 ShelfViewTestAPI::shelf_button_pressed_metric_tracker() { | 170 ShelfViewTestAPI::shelf_button_pressed_metric_tracker() { |
171 return &(shelf_view_->shelf_button_pressed_metric_tracker_); | 171 return &(shelf_view_->shelf_button_pressed_metric_tracker_); |
172 } | 172 } |
173 | 173 |
174 } // namespace test | 174 } // namespace test |
175 } // namespace ash | 175 } // namespace ash |
OLD | NEW |