| 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/common/shelf/overflow_button.h" |
| 8 #include "ash/common/shelf/shelf_button.h" |
| 8 #include "ash/common/shelf/shelf_constants.h" | 9 #include "ash/common/shelf/shelf_constants.h" |
| 9 #include "ash/common/shelf/shelf_model.h" | 10 #include "ash/common/shelf/shelf_model.h" |
| 10 #include "ash/shelf/shelf_button.h" | |
| 11 #include "ash/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 "ui/views/animation/bounds_animator.h" | 13 #include "ui/views/animation/bounds_animator.h" |
| 14 #include "ui/views/controls/menu/menu_runner.h" | 14 #include "ui/views/controls/menu/menu_runner.h" |
| 15 #include "ui/views/view_model.h" | 15 #include "ui/views/view_model.h" |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 // A class used to wait for animations. | 19 // A class used to wait for animations. |
| 20 class TestAPIAnimationObserver : public views::BoundsAnimatorObserver { | 20 class TestAPIAnimationObserver : public views::BoundsAnimatorObserver { |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 return shelf_view_->dragged_off_from_overflow_to_shelf_; | 156 return shelf_view_->dragged_off_from_overflow_to_shelf_; |
| 157 } | 157 } |
| 158 | 158 |
| 159 ShelfButtonPressedMetricTracker* | 159 ShelfButtonPressedMetricTracker* |
| 160 ShelfViewTestAPI::shelf_button_pressed_metric_tracker() { | 160 ShelfViewTestAPI::shelf_button_pressed_metric_tracker() { |
| 161 return &(shelf_view_->shelf_button_pressed_metric_tracker_); | 161 return &(shelf_view_->shelf_button_pressed_metric_tracker_); |
| 162 } | 162 } |
| 163 | 163 |
| 164 } // namespace test | 164 } // namespace test |
| 165 } // namespace ash | 165 } // namespace ash |
| OLD | NEW |