| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
|
| index 89dc0871d41acaca83d84f0581ab9d540cd24c4f..ff38412bb7d3cec8de14b9290d152d4b53af8853 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl_browsertest.cc
|
| @@ -10,6 +10,7 @@
|
| #include "ash/common/shelf/shelf_constants.h"
|
| #include "ash/common/shelf/shelf_model.h"
|
| #include "ash/common/wm/window_state.h"
|
| +#include "ash/shelf/app_list_button.h"
|
| #include "ash/shelf/shelf.h"
|
| #include "ash/shelf/shelf_button.h"
|
| #include "ash/shelf/shelf_util.h"
|
| @@ -1656,7 +1657,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, DISABLED_DragAndDrop) {
|
|
|
| // Open the app list menu and check that the drag and drop host was set.
|
| gfx::Rect app_list_bounds =
|
| - test.shelf_view()->GetAppListButtonView()->GetBoundsInScreen();
|
| + test.shelf_view()->GetAppListButton()->GetBoundsInScreen();
|
| generator.MoveMouseTo(app_list_bounds.CenterPoint().x(),
|
| app_list_bounds.CenterPoint().y());
|
| base::RunLoop().RunUntilIdle();
|
| @@ -1800,7 +1801,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTestWithMultiMonitor,
|
|
|
| // Open the app list menu and check that the drag and drop host was set.
|
| gfx::Rect app_list_bounds =
|
| - test.shelf_view()->GetAppListButtonView()->GetBoundsInScreen();
|
| + test.shelf_view()->GetAppListButton()->GetBoundsInScreen();
|
| display::Display display =
|
| display::Screen::GetScreen()->GetDisplayNearestWindow(
|
| secondary_root_window);
|
| @@ -1987,7 +1988,7 @@ IN_PROC_BROWSER_TEST_F(ShelfAppBrowserTest, ClickItem) {
|
|
|
| // Open the app list menu and check that the drag and drop host was set.
|
| gfx::Rect app_list_bounds =
|
| - test.shelf_view()->GetAppListButtonView()->GetBoundsInScreen();
|
| + test.shelf_view()->GetAppListButton()->GetBoundsInScreen();
|
| generator.MoveMouseTo(app_list_bounds.CenterPoint().x(),
|
| app_list_bounds.CenterPoint().y());
|
| generator.ClickLeftButton();
|
|
|