| Index: ash/shelf/shelf_layout_manager.cc
|
| diff --git a/ash/common/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
|
| similarity index 98%
|
| rename from ash/common/shelf/shelf_layout_manager.cc
|
| rename to ash/shelf/shelf_layout_manager.cc
|
| index 5849bb7f85a8327a9c5e36fa3b561d118bab387c..df1aa2228f9435036ac7c41ca425097f061965d0 100644
|
| --- a/ash/common/shelf/shelf_layout_manager.cc
|
| +++ b/ash/shelf/shelf_layout_manager.cc
|
| @@ -2,28 +2,28 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ash/common/shelf/shelf_layout_manager.h"
|
| +#include "ash/shelf/shelf_layout_manager.h"
|
|
|
| #include <algorithm>
|
| #include <cmath>
|
| #include <vector>
|
|
|
| #include "ash/animation/animation_change_type.h"
|
| -#include "ash/common/session/session_controller.h"
|
| -#include "ash/common/session/session_state_delegate.h"
|
| -#include "ash/common/shelf/shelf_constants.h"
|
| -#include "ash/common/shelf/shelf_layout_manager_observer.h"
|
| -#include "ash/common/shelf/shelf_widget.h"
|
| -#include "ash/common/shelf/wm_shelf.h"
|
| -#include "ash/common/wm/fullscreen_window_finder.h"
|
| -#include "ash/common/wm/mru_window_tracker.h"
|
| -#include "ash/common/wm/window_state.h"
|
| -#include "ash/common/wm/wm_screen_util.h"
|
| -#include "ash/common/wm_shell.h"
|
| -#include "ash/common/wm_window.h"
|
| #include "ash/public/cpp/shell_window_ids.h"
|
| #include "ash/root_window_controller.h"
|
| +#include "ash/session/session_controller.h"
|
| +#include "ash/session/session_state_delegate.h"
|
| +#include "ash/shelf/shelf_constants.h"
|
| +#include "ash/shelf/shelf_layout_manager_observer.h"
|
| +#include "ash/shelf/shelf_widget.h"
|
| +#include "ash/shelf/wm_shelf.h"
|
| #include "ash/system/status_area_widget.h"
|
| +#include "ash/wm/fullscreen_window_finder.h"
|
| +#include "ash/wm/mru_window_tracker.h"
|
| +#include "ash/wm/window_state.h"
|
| +#include "ash/wm/wm_screen_util.h"
|
| +#include "ash/wm_shell.h"
|
| +#include "ash/wm_window.h"
|
| #include "base/auto_reset.h"
|
| #include "base/command_line.h"
|
| #include "base/i18n/rtl.h"
|
|
|