| 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/common/shelf/shelf_model.h" |
| 9 #include "ash/shelf/overflow_button.h" | 9 #include "ash/shelf/overflow_button.h" |
| 10 #include "ash/shelf/shelf_button.h" | 10 #include "ash/shelf/shelf_button.h" |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 | 112 |
| 113 int ShelfViewTestAPI::GetButtonSize() { | 113 int ShelfViewTestAPI::GetButtonSize() { |
| 114 return kShelfButtonSize; | 114 return kShelfButtonSize; |
| 115 } | 115 } |
| 116 | 116 |
| 117 int ShelfViewTestAPI::GetButtonSpacing() { | 117 int ShelfViewTestAPI::GetButtonSpacing() { |
| 118 return kShelfButtonSpacing; | 118 return kShelfButtonSpacing; |
| 119 } | 119 } |
| 120 | 120 |
| 121 void ShelfViewTestAPI::ButtonPressed(views::Button* sender, | 121 void ShelfViewTestAPI::ButtonPressed(views::Button* sender, |
| 122 const ui::Event& event) { | 122 const ui::Event& event, |
| 123 return shelf_view_->ButtonPressed(sender, event); | 123 views::InkDrop* ink_drop) { |
| 124 return shelf_view_->ButtonPressed(sender, event, ink_drop); |
| 124 } | 125 } |
| 125 | 126 |
| 126 bool ShelfViewTestAPI::SameDragType(ShelfItemType typea, | 127 bool ShelfViewTestAPI::SameDragType(ShelfItemType typea, |
| 127 ShelfItemType typeb) const { | 128 ShelfItemType typeb) const { |
| 128 return shelf_view_->SameDragType(typea, typeb); | 129 return shelf_view_->SameDragType(typea, typeb); |
| 129 } | 130 } |
| 130 | 131 |
| 131 void ShelfViewTestAPI::SetShelfDelegate(ShelfDelegate* delegate) { | 132 void ShelfViewTestAPI::SetShelfDelegate(ShelfDelegate* delegate) { |
| 132 shelf_view_->delegate_ = delegate; | 133 shelf_view_->delegate_ = delegate; |
| 133 } | 134 } |
| (...skipping 10 matching lines...) Expand all Loading... |
| 144 return shelf_view_->dragged_off_from_overflow_to_shelf_; | 145 return shelf_view_->dragged_off_from_overflow_to_shelf_; |
| 145 } | 146 } |
| 146 | 147 |
| 147 ShelfButtonPressedMetricTracker* | 148 ShelfButtonPressedMetricTracker* |
| 148 ShelfViewTestAPI::shelf_button_pressed_metric_tracker() { | 149 ShelfViewTestAPI::shelf_button_pressed_metric_tracker() { |
| 149 return &(shelf_view_->shelf_button_pressed_metric_tracker_); | 150 return &(shelf_view_->shelf_button_pressed_metric_tracker_); |
| 150 } | 151 } |
| 151 | 152 |
| 152 } // namespace test | 153 } // namespace test |
| 153 } // namespace ash | 154 } // namespace ash |
| OLD | NEW |