diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc index 50ec193..a27e08d 100644 --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc @@ -10,7 +10,7 @@ #include "ash/ash_switches.h" #include "ash/display/display_controller.h" #include "ash/launcher/launcher.h" -#include "ash/launcher/launcher_button.h" +#include "ash/shelf/shelf_button.h" #include "ash/shelf/shelf_model.h" #include "ash/shelf/shelf_util.h" #include "ash/shelf/shelf_view.h" @@ -276,7 +276,7 @@ class LauncherAppBrowserTest : public ExtensionBrowserTest { aura::test::EventGenerator* generator, ash::test::ShelfViewTestAPI* test, RipOffCommand command) { - ash::internal::LauncherButton* button = test->GetButton(index); + ash::internal::ShelfButton* button = test->GetButton(index); gfx::Point start_point = button->GetBoundsInScreen().CenterPoint(); gfx::Point rip_off_point(start_point.x(), 0); generator->MoveMouseTo(start_point.x(), start_point.y()); @@ -1668,8 +1668,8 @@ IN_PROC_BROWSER_TEST_F(LauncherAppBrowserTest, DragOffShelf) { GetIndexOfShelfItemType(ash::TYPE_BROWSER_SHORTCUT)); // Make sure that the hide state has been unset after the snap back animation // finished. - ash::internal::LauncherButton* button = test.GetButton(browser_index); - EXPECT_FALSE(button->state() & ash::internal::LauncherButton::STATE_HIDDEN); + ash::internal::ShelfButton* button = test.GetButton(browser_index); + EXPECT_FALSE(button->state() & ash::internal::ShelfButton::STATE_HIDDEN); // Test #2: Ripping out the application and canceling the operation should // not change anything. |