| 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 01f0bbc0a3a658be30606263e06907f15bfcc8f6..3b11ebbafa5bd703ecca96dccc8632966f94282d 100644
|
| --- a/ash/wm/panels/panel_layout_manager_unittest.cc
|
| +++ b/ash/wm/panels/panel_layout_manager_unittest.cc
|
| @@ -16,13 +16,13 @@
|
| #include "ash/common/wm/window_state.h"
|
| #include "ash/common/wm_shell.h"
|
| #include "ash/common/wm_window.h"
|
| -#include "ash/common/wm_window_property.h"
|
| #include "ash/public/cpp/shelf_types.h"
|
| #include "ash/public/cpp/shell_window_ids.h"
|
| #include "ash/root_window_controller.h"
|
| #include "ash/shell.h"
|
| #include "ash/test/ash_test_base.h"
|
| #include "ash/test/shelf_view_test_api.h"
|
| +#include "ash/wm/window_properties.h"
|
| #include "ash/wm/window_state_aura.h"
|
| #include "ash/wm/window_util.h"
|
| #include "base/command_line.h"
|
| @@ -220,7 +220,7 @@ class PanelLayoutManagerTest : public test::AshTestBase {
|
| test_api.SetAnimationDuration(1);
|
| test_api.RunMessageLoopUntilAnimationsDone();
|
| int index = WmShell::Get()->shelf_model()->ItemIndexByID(
|
| - WmWindow::Get(window)->GetIntProperty(WmWindowProperty::SHELF_ID));
|
| + window->GetProperty(kShelfIDKey));
|
| gfx::Rect bounds = test_api.GetButton(index)->GetBoundsInScreen();
|
|
|
| ui::test::EventGenerator& event_generator = GetEventGenerator();
|
|
|