| Index: ash/wm/panels/panel_window_resizer.cc
|
| diff --git a/ash/wm/panels/panel_window_resizer.cc b/ash/wm/panels/panel_window_resizer.cc
|
| index 1425485cc485804a6ea6be039e5c9dad4d89e7e0..7f517e608c13289b32503e06652f94cb7c4fa586 100644
|
| --- a/ash/wm/panels/panel_window_resizer.cc
|
| +++ b/ash/wm/panels/panel_window_resizer.cc
|
| @@ -7,7 +7,7 @@
|
| #include "ash/public/cpp/shell_window_ids.h"
|
| #include "ash/public/cpp/window_properties.h"
|
| #include "ash/root_window_controller.h"
|
| -#include "ash/shelf/wm_shelf.h"
|
| +#include "ash/shelf/shelf.h"
|
| #include "ash/shell.h"
|
| #include "ash/wm/panels/panel_layout_manager.h"
|
| #include "ash/wm/window_parenting_utils.h"
|
| @@ -124,7 +124,7 @@ bool PanelWindowResizer::AttachToLauncher(const gfx::Rect& bounds,
|
| gfx::Rect launcher_bounds =
|
| panel_layout_manager->shelf()->GetWindow()->GetBoundsInScreen();
|
| ::wm::ConvertRectFromScreen(GetTarget()->parent(), &launcher_bounds);
|
| - switch (panel_layout_manager->shelf()->GetAlignment()) {
|
| + switch (panel_layout_manager->shelf()->alignment()) {
|
| case SHELF_ALIGNMENT_BOTTOM:
|
| case SHELF_ALIGNMENT_BOTTOM_LOCKED:
|
| if (bounds.bottom() >=
|
|
|