| Index: ash/shelf/shelf_layout_manager.cc
|
| diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
|
| index efb1a9349bd1d251c08d31fe361ec2314758efe3..76b8241657ead6a64ed34bb72e4acb7d226c697c 100644
|
| --- a/ash/shelf/shelf_layout_manager.cc
|
| +++ b/ash/shelf/shelf_layout_manager.cc
|
| @@ -25,6 +25,7 @@
|
| #include "ash/shell_window_ids.h"
|
| #include "ash/system/status_area_widget.h"
|
| #include "ash/wm/aura/wm_window_aura.h"
|
| +#include "ash/wm/common/shelf/wm_shelf_util.h"
|
| #include "ash/wm/common/window_state.h"
|
| #include "ash/wm/common/wm_root_window_controller.h"
|
| #include "ash/wm/common/wm_root_window_controller_observer.h"
|
| @@ -528,7 +529,7 @@ void ShelfLayoutManager::OnWindowActivated(
|
| }
|
|
|
| bool ShelfLayoutManager::IsHorizontalAlignment() const {
|
| - return ash::IsHorizontalAlignment(GetAlignment());
|
| + return wm::IsHorizontalAlignment(GetAlignment());
|
| }
|
|
|
| void ShelfLayoutManager::SetChromeVoxPanelHeight(int height) {
|
|
|