| 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/shelf_constants.h" | 7 #include "ash/common/shelf/shelf_constants.h" |
| 8 #include "ash/common/shelf/shelf_model.h" |
| 8 #include "ash/shelf/overflow_button.h" | 9 #include "ash/shelf/overflow_button.h" |
| 9 #include "ash/shelf/shelf_button.h" | 10 #include "ash/shelf/shelf_button.h" |
| 10 #include "ash/shelf/shelf_model.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/view_model.h" | 14 #include "ui/views/view_model.h" |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 // A class used to wait for animations. | 18 // A class used to wait for animations. |
| 19 class TestAPIAnimationObserver : public views::BoundsAnimatorObserver { | 19 class TestAPIAnimationObserver : public views::BoundsAnimatorObserver { |
| 20 public: | 20 public: |
| (...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 return shelf_view_->dragged_off_from_overflow_to_shelf_; | 144 return shelf_view_->dragged_off_from_overflow_to_shelf_; |
| 145 } | 145 } |
| 146 | 146 |
| 147 ShelfButtonPressedMetricTracker* | 147 ShelfButtonPressedMetricTracker* |
| 148 ShelfViewTestAPI::shelf_button_pressed_metric_tracker() { | 148 ShelfViewTestAPI::shelf_button_pressed_metric_tracker() { |
| 149 return &(shelf_view_->shelf_button_pressed_metric_tracker_); | 149 return &(shelf_view_->shelf_button_pressed_metric_tracker_); |
| 150 } | 150 } |
| 151 | 151 |
| 152 } // namespace test | 152 } // namespace test |
| 153 } // namespace ash | 153 } // namespace ash |
| OLD | NEW |