mash: Move ash/common/wm/shelf to ash/common/shelf

ash/common/shelf/wm_shelf_observer.h

Index: ash/common/shelf/wm_shelf_observer.h
diff --git a/ash/common/wm/shelf/wm_shelf_observer.h b/ash/common/shelf/wm_shelf_observer.h
similarity index 73%
rename from ash/common/wm/shelf/wm_shelf_observer.h
rename to ash/common/shelf/wm_shelf_observer.h
index e53f9a502db049c9b560bed80c0dd6fcfab6eb97..76cd4a5f14c1d797266d44036ef4434a788a2119 100644
--- a/ash/common/wm/shelf/wm_shelf_observer.h
+++ b/ash/common/shelf/wm_shelf_observer.h
@@ -2,19 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_COMMON_WM_SHELF_WM_SHELF_OBSERVER_H_
-#define ASH_COMMON_WM_SHELF_WM_SHELF_OBSERVER_H_
+#ifndef ASH_COMMON_SHELF_WM_SHELF_OBSERVER_H_
+#define ASH_COMMON_SHELF_WM_SHELF_OBSERVER_H_
 
 #include "ash/ash_export.h"
+#include "ash/common/shelf/shelf_types.h"
 #include "ash/common/wm/background_animator.h"
-#include "ash/common/wm/shelf/wm_shelf_types.h"
 
 namespace ash {
 
-class WmWindow;
-
-namespace wm {
-
 // Used to observe changes to the shelf.
 class ASH_EXPORT WmShelfObserver {
  public:
@@ -27,7 +23,6 @@ class ASH_EXPORT WmShelfObserver {
   virtual ~WmShelfObserver() {}
 };
 
-}  // namespace wm
 }  // namespace ash
 
-#endif  // ASH_COMMON_WM_SHELF_WM_SHELF_OBSERVER_H_
+#endif  // ASH_COMMON_SHELF_WM_SHELF_OBSERVER_H_