Shuffles and renames ash/common/wm classes

ash/common/wm_display_observer.h

Index: ash/common/wm_display_observer.h
diff --git a/ash/common/wm/wm_display_observer.h b/ash/common/wm_display_observer.h
similarity index 77%
rename from ash/common/wm/wm_display_observer.h
rename to ash/common/wm_display_observer.h
index 937ff9c312bd49ff181f0d96b7a21c25e160ca2c..22564575a1a3580e06f6364bba7c2d37e756091f 100644
--- a/ash/common/wm/wm_display_observer.h
+++ b/ash/common/wm_display_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_DISPLAY_OBSERVER_H_
-#define ASH_COMMON_WM_WM_DISPLAY_OBSERVER_H_
+#ifndef ASH_COMMON_WM_DISPLAY_OBSERVER_H_
+#define ASH_COMMON_WM_DISPLAY_OBSERVER_H_
 
 #include "ash/ash_export.h"
 
 namespace ash {
-namespace wm {
 
 class WmWindow;
 
@@ -25,7 +24,6 @@ class ASH_EXPORT WmDisplayObserver {
   virtual ~WmDisplayObserver() {}
 };
 
-}  // namespace wm
 }  // namespace ash
 
-#endif  // ASH_COMMON_WM_WM_DISPLAY_OBSERVER_H_
+#endif  // ASH_COMMON_WM_DISPLAY_OBSERVER_H_