| Index: ash/test/shelf_view_test_api.cc
|
| diff --git a/ash/test/shelf_view_test_api.cc b/ash/test/shelf_view_test_api.cc
|
| index 2147ada50b94e166973c5d2789f386534bfccd65..d3d545c9e5cb99bd82ce5eee15f21b44bb2d5a7e 100644
|
| --- a/ash/test/shelf_view_test_api.cc
|
| +++ b/ash/test/shelf_view_test_api.cc
|
| @@ -36,9 +36,8 @@ class TestAPIAnimationObserver : public views::BoundsAnimatorObserver {
|
| namespace ash {
|
| namespace test {
|
|
|
| -ShelfViewTestAPI::ShelfViewTestAPI(internal::ShelfView* shelf_view)
|
| - : shelf_view_(shelf_view) {
|
| -}
|
| +ShelfViewTestAPI::ShelfViewTestAPI(ShelfView* shelf_view)
|
| + : shelf_view_(shelf_view) {}
|
|
|
| ShelfViewTestAPI::~ShelfViewTestAPI() {
|
| }
|
| @@ -47,13 +46,12 @@ int ShelfViewTestAPI::GetButtonCount() {
|
| return shelf_view_->view_model_->view_size();
|
| }
|
|
|
| -internal::ShelfButton* ShelfViewTestAPI::GetButton(int index) {
|
| +ShelfButton* ShelfViewTestAPI::GetButton(int index) {
|
| // App list button is not a ShelfButton.
|
| if (shelf_view_->model_->items()[index].type == ash::TYPE_APP_LIST)
|
| return NULL;
|
|
|
| - return static_cast<internal::ShelfButton*>(
|
| - shelf_view_->view_model_->view_at(index));
|
| + return static_cast<ShelfButton*>(shelf_view_->view_model_->view_at(index));
|
| }
|
|
|
| int ShelfViewTestAPI::GetFirstVisibleIndex() {
|
| @@ -99,7 +97,7 @@ void ShelfViewTestAPI::RunMessageLoopUntilAnimationsDone() {
|
| shelf_view_->bounds_animator_->RemoveObserver(observer.get());
|
| }
|
|
|
| -internal::OverflowBubble* ShelfViewTestAPI::overflow_bubble() {
|
| +OverflowBubble* ShelfViewTestAPI::overflow_bubble() {
|
| return shelf_view_->overflow_bubble_.get();
|
| }
|
|
|
|
|