| Index: ash/wm/panels/panel_layout_manager_unittest.cc
|
| diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc
|
| index 4bee3c4256b99fb29b1588ec9f1d55a8d7c41f09..005d966baa2a6c1042f33bc35c1b4e965887257b 100644
|
| --- a/ash/wm/panels/panel_layout_manager_unittest.cc
|
| +++ b/ash/wm/panels/panel_layout_manager_unittest.cc
|
| @@ -7,10 +7,10 @@
|
| #include "ash/ash_switches.h"
|
| #include "ash/launcher/launcher.h"
|
| #include "ash/launcher/launcher_button.h"
|
| -#include "ash/launcher/launcher_model.h"
|
| #include "ash/root_window_controller.h"
|
| #include "ash/screen_ash.h"
|
| #include "ash/shelf/shelf_layout_manager.h"
|
| +#include "ash/shelf/shelf_model.h"
|
| #include "ash/shelf/shelf_types.h"
|
| #include "ash/shelf/shelf_view.h"
|
| #include "ash/shelf/shelf_widget.h"
|
| @@ -222,8 +222,7 @@ class PanelLayoutManagerTest : public test::AshTestBase {
|
| test::ShelfViewTestAPI test_api(shelf_view);
|
| test_api.SetAnimationDuration(1);
|
| test_api.RunMessageLoopUntilAnimationsDone();
|
| - LauncherModel* model =
|
| - test::ShellTestApi(Shell::GetInstance()).launcher_model();
|
| + ShelfModel* model = test::ShellTestApi(Shell::GetInstance()).shelf_model();
|
| test::TestLauncherDelegate* launcher_delegate =
|
| test::TestLauncherDelegate::instance();
|
| int index = model->ItemIndexByID(launcher_delegate->GetIDByWindow(window));
|
|
|