| Index: ash/shelf/shelf_layout_manager.h
|
| diff --git a/ash/common/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
|
| similarity index 95%
|
| rename from ash/common/shelf/shelf_layout_manager.h
|
| rename to ash/shelf/shelf_layout_manager.h
|
| index 87f598a8bd6267c271b5aa9a1230e5e023772d4b..9ff211b79fc97c9746878c454e05bd4ffa680d50 100644
|
| --- a/ash/common/shelf/shelf_layout_manager.h
|
| +++ b/ash/shelf/shelf_layout_manager.h
|
| @@ -2,21 +2,21 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_
|
| -#define ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_
|
| +#ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
|
| +#define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
|
|
|
| #include <memory>
|
|
|
| #include "ash/ash_export.h"
|
| -#include "ash/common/session/session_state_observer.h"
|
| -#include "ash/common/shelf/wm_shelf.h"
|
| -#include "ash/common/shell_observer.h"
|
| -#include "ash/common/wm/dock/docked_window_layout_manager_observer.h"
|
| -#include "ash/common/wm/lock_state_observer.h"
|
| -#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h"
|
| -#include "ash/common/wm/workspace/workspace_types.h"
|
| -#include "ash/common/wm_activation_observer.h"
|
| #include "ash/public/cpp/shelf_types.h"
|
| +#include "ash/session/session_state_observer.h"
|
| +#include "ash/shelf/wm_shelf.h"
|
| +#include "ash/shell_observer.h"
|
| +#include "ash/wm/dock/docked_window_layout_manager_observer.h"
|
| +#include "ash/wm/lock_state_observer.h"
|
| +#include "ash/wm/wm_snap_to_pixel_layout_manager.h"
|
| +#include "ash/wm/workspace/workspace_types.h"
|
| +#include "ash/wm_activation_observer.h"
|
| #include "base/macros.h"
|
| #include "base/observer_list.h"
|
| #include "base/timer/timer.h"
|
| @@ -362,4 +362,4 @@ class ASH_EXPORT ShelfLayoutManager
|
|
|
| } // namespace ash
|
|
|
| -#endif // ASH_COMMON_SHELF_SHELF_LAYOUT_MANAGER_H_
|
| +#endif // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
|
|
|