| Index: ash/common/wm_activation_observer.h
|
| diff --git a/ash/common/wm/wm_activation_observer.h b/ash/common/wm_activation_observer.h
|
| similarity index 82%
|
| rename from ash/common/wm/wm_activation_observer.h
|
| rename to ash/common/wm_activation_observer.h
|
| index c643d5f76b1f70c6ac55b8acb290b319fbdcba29..b2b9a6ddb2eb517424f0028ef4ce6268443f5ce5 100644
|
| --- a/ash/common/wm/wm_activation_observer.h
|
| +++ b/ash/common/wm_activation_observer.h
|
| @@ -2,13 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef ASH_COMMON_WM_WM_ACTIVATION_OBSERVER_H_
|
| -#define ASH_COMMON_WM_WM_ACTIVATION_OBSERVER_H_
|
| +#ifndef ASH_COMMON_WM_ACTIVATION_OBSERVER_H_
|
| +#define ASH_COMMON_WM_ACTIVATION_OBSERVER_H_
|
|
|
| #include "ash/ash_export.h"
|
|
|
| namespace ash {
|
| -namespace wm {
|
|
|
| class WmWindow;
|
|
|
| @@ -28,7 +27,6 @@ class ASH_EXPORT WmActivationObserver {
|
| virtual ~WmActivationObserver() {}
|
| };
|
|
|
| -} // namespace wm
|
| } // namespace ash
|
|
|
| -#endif // ASH_COMMON_WM_WM_ACTIVATION_OBSERVER_H_
|
| +#endif // ASH_COMMON_WM_ACTIVATION_OBSERVER_H_
|
|
|