| Index: ash/shelf/shelf_view_unittest.cc
|
| diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc
|
| index adf61ebd7fa2f81ecaff7491747c360594bcc9c6..9ef5a43cca2bb0bc77c13888d7d680ba2f1813a6 100644
|
| --- a/ash/shelf/shelf_view_unittest.cc
|
| +++ b/ash/shelf/shelf_view_unittest.cc
|
| @@ -1482,7 +1482,7 @@ TEST_F(ShelfViewTest, ShouldHideTooltipTest) {
|
| }
|
|
|
| // The tooltip should not hide on the app-list button.
|
| - views::View* app_list_button = shelf_view_->GetAppListButtonView();
|
| + AppListButton* app_list_button = shelf_view_->GetAppListButton();
|
| EXPECT_FALSE(shelf_view_->ShouldHideTooltip(
|
| app_list_button->GetMirroredBounds().CenterPoint()));
|
|
|
| @@ -1503,7 +1503,7 @@ TEST_F(ShelfViewTest, ShouldHideTooltipTest) {
|
|
|
| all_area.Union(button->GetMirroredBounds());
|
| }
|
| - all_area.Union(shelf_view_->GetAppListButtonView()->GetMirroredBounds());
|
| + all_area.Union(shelf_view_->GetAppListButton()->GetMirroredBounds());
|
| EXPECT_FALSE(shelf_view_->ShouldHideTooltip(all_area.origin()));
|
| EXPECT_FALSE(shelf_view_->ShouldHideTooltip(
|
| gfx::Point(all_area.right() - 1, all_area.bottom() - 1)));
|
| @@ -1533,7 +1533,7 @@ TEST_F(ShelfViewTest, ShouldHideTooltipWithAppListWindowTest) {
|
| }
|
|
|
| // The tooltip should hide on the app-list button.
|
| - views::View* app_list_button = shelf_view_->GetAppListButtonView();
|
| + AppListButton* app_list_button = shelf_view_->GetAppListButton();
|
| EXPECT_TRUE(shelf_view_->ShouldHideTooltip(
|
| app_list_button->GetMirroredBounds().CenterPoint()));
|
| }
|
| @@ -1550,7 +1550,7 @@ TEST_F(ShelfViewTest, ShouldHideTooltipWhenHoveringOnTooltip) {
|
| EXPECT_FALSE(tooltip_manager->IsVisible());
|
|
|
| // Move the mouse over the button and check that it is visible.
|
| - views::View* app_list_button = shelf_view_->GetAppListButtonView();
|
| + AppListButton* app_list_button = shelf_view_->GetAppListButton();
|
| gfx::Rect bounds = app_list_button->GetBoundsInScreen();
|
| generator.MoveMouseTo(bounds.CenterPoint());
|
| // Wait for the timer to go off.
|
| @@ -1860,8 +1860,7 @@ TEST_F(ShelfViewTest, CheckOverflowStatusPinOpenedAppToShelf) {
|
|
|
| // Tests that the AppListButton renders as active in response to touches.
|
| TEST_F(ShelfViewTest, AppListButtonTouchFeedback) {
|
| - AppListButton* app_list_button =
|
| - static_cast<AppListButton*>(shelf_view_->GetAppListButtonView());
|
| + AppListButton* app_list_button = shelf_view_->GetAppListButton();
|
| EXPECT_FALSE(app_list_button->draw_background_as_active());
|
|
|
| ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
|
| @@ -1878,8 +1877,7 @@ TEST_F(ShelfViewTest, AppListButtonTouchFeedback) {
|
| // Tests that a touch that slides out of the bounds of the AppListButton leads
|
| // to the end of rendering an active state.
|
| TEST_F(ShelfViewTest, AppListButtonTouchFeedbackCancellation) {
|
| - AppListButton* app_list_button =
|
| - static_cast<AppListButton*>(shelf_view_->GetAppListButtonView());
|
| + AppListButton* app_list_button = shelf_view_->GetAppListButton();
|
| EXPECT_FALSE(app_list_button->draw_background_as_active());
|
|
|
| ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
|
| @@ -1978,8 +1976,8 @@ class ShelfViewVisibleBoundsTest : public ShelfViewTest,
|
|
|
| void CheckAppListButtonIsInBounds() {
|
| gfx::Rect visible_bounds = shelf_view_->GetVisibleItemsBoundsInScreen();
|
| - gfx::Rect app_list_button_bounds = shelf_view_->GetAppListButtonView()->
|
| - GetBoundsInScreen();
|
| + gfx::Rect app_list_button_bounds =
|
| + shelf_view_->GetAppListButton()->GetBoundsInScreen();
|
| EXPECT_TRUE(visible_bounds.Contains(app_list_button_bounds));
|
| }
|
|
|
|
|