| Index: ash/wm/panels/panel_layout_manager.h
|
| diff --git a/ash/common/wm/panels/panel_layout_manager.h b/ash/wm/panels/panel_layout_manager.h
|
| similarity index 96%
|
| rename from ash/common/wm/panels/panel_layout_manager.h
|
| rename to ash/wm/panels/panel_layout_manager.h
|
| index ff1047eb7d3199b66dc26f83c133e8d2d71326e4..7a435bb8e894cbae54d4fb90197b1aeaa7325501 100644
|
| --- a/ash/common/wm/panels/panel_layout_manager.h
|
| +++ b/ash/wm/panels/panel_layout_manager.h
|
| @@ -2,20 +2,20 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef ASH_COMMON_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
|
| -#define ASH_COMMON_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
|
| +#ifndef ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
|
| +#define ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
|
|
|
| #include <list>
|
| #include <memory>
|
|
|
| #include "ash/ash_export.h"
|
| -#include "ash/common/shelf/wm_shelf_observer.h"
|
| #include "ash/common/shell_observer.h"
|
| -#include "ash/common/wm/window_state_observer.h"
|
| #include "ash/common/wm_activation_observer.h"
|
| #include "ash/common/wm_display_observer.h"
|
| #include "ash/common/wm_layout_manager.h"
|
| #include "ash/root_window_controller.h"
|
| +#include "ash/shelf/wm_shelf_observer.h"
|
| +#include "ash/wm/window_state_observer.h"
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| @@ -202,4 +202,4 @@ class ASH_EXPORT PanelLayoutManager
|
|
|
| } // namespace ash
|
|
|
| -#endif // ASH_COMMON_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
|
| +#endif // ASH_WM_PANELS_PANEL_LAYOUT_MANAGER_H_
|
|
|