| Index: ash/aura/aura_layout_manager_adapter.h
|
| diff --git a/ash/wm/aura/aura_layout_manager_adapter.h b/ash/aura/aura_layout_manager_adapter.h
|
| similarity index 88%
|
| rename from ash/wm/aura/aura_layout_manager_adapter.h
|
| rename to ash/aura/aura_layout_manager_adapter.h
|
| index e5e7ac45a1333dab7a5c4c2d54e39e7ac9d6655f..daa1235e8fb20ad0f51dab7176ba420542d47317 100644
|
| --- a/ash/wm/aura/aura_layout_manager_adapter.h
|
| +++ b/ash/aura/aura_layout_manager_adapter.h
|
| @@ -2,8 +2,8 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef ASH_WM_AURA_AURA_LAYOUT_MANAGER_ADAPTER_H_
|
| -#define ASH_WM_AURA_AURA_LAYOUT_MANAGER_ADAPTER_H_
|
| +#ifndef ASH_AURA_AURA_LAYOUT_MANAGER_ADAPTER_H_
|
| +#define ASH_AURA_AURA_LAYOUT_MANAGER_ADAPTER_H_
|
|
|
| #include <memory>
|
|
|
| @@ -12,7 +12,6 @@
|
| #include "ui/aura/layout_manager.h"
|
|
|
| namespace ash {
|
| -namespace wm {
|
|
|
| class WmLayoutManager;
|
|
|
| @@ -43,7 +42,6 @@ class ASH_EXPORT AuraLayoutManagerAdapter : public aura::LayoutManager {
|
| DISALLOW_COPY_AND_ASSIGN(AuraLayoutManagerAdapter);
|
| };
|
|
|
| -} // namespace wm
|
| } // namespace ash
|
|
|
| -#endif // ASH_WM_AURA_AURA_LAYOUT_MANAGER_ADAPTER_H_
|
| +#endif // ASH_AURA_AURA_LAYOUT_MANAGER_ADAPTER_H_
|
|
|