| Index: ash/shelf/shelf_layout_manager.cc
|
| diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
|
| index 9bc695ac525ae1f1c1148a25be4e1a3d20270ca3..482fbb58141b87a34383da830123ebe18f7a3fc3 100644
|
| --- a/ash/shelf/shelf_layout_manager.cc
|
| +++ b/ash/shelf/shelf_layout_manager.cc
|
| @@ -24,11 +24,11 @@
|
| #include "ash/shell.h"
|
| #include "ash/shell_window_ids.h"
|
| #include "ash/system/status_area_widget.h"
|
| +#include "ash/wm/common/window_state.h"
|
| #include "ash/wm/gestures/shelf_gesture_handler.h"
|
| #include "ash/wm/lock_state_controller.h"
|
| #include "ash/wm/mru_window_tracker.h"
|
| #include "ash/wm/window_animations.h"
|
| -#include "ash/wm/window_state.h"
|
| #include "ash/wm/window_state_aura.h"
|
| #include "ash/wm/window_util.h"
|
| #include "ash/wm/workspace_controller.h"
|
|
|