Shuffles and renames ash/common/wm classes

ash/desktop_background/desktop_background_widget_controller.h

Index: ash/desktop_background/desktop_background_widget_controller.h
diff --git a/ash/desktop_background/desktop_background_widget_controller.h b/ash/desktop_background/desktop_background_widget_controller.h
index dcfaee036c2b64aaba3ab9fd12b5940640b45ecd..22845545e459d1707dd2e9294c1407f54aaf7fc3 100644
--- a/ash/desktop_background/desktop_background_widget_controller.h
+++ b/ash/desktop_background/desktop_background_widget_controller.h
@@ -8,7 +8,7 @@
 #include <memory>
 
 #include "ash/ash_export.h"
-#include "ash/common/wm/wm_window_observer.h"
+#include "ash/common/wm_window_observer.h"
 #include "base/macros.h"
 #include "ui/views/widget/widget_observer.h"
 
@@ -25,7 +25,7 @@ class RootWindowController;
 // destroyed. Exported for tests.
 class ASH_EXPORT DesktopBackgroundWidgetController
     : public views::WidgetObserver,
-      public wm::WmWindowObserver {
+      public WmWindowObserver {
  public:
   // Create
   explicit DesktopBackgroundWidgetController(views::Widget* widget);
@@ -55,15 +55,15 @@ class ASH_EXPORT DesktopBackgroundWidgetController
  private:
   void RemoveObservers();
 
-  // wm::WmWindowObserver:
-  void OnWindowBoundsChanged(wm::WmWindow* window,
+  // WmWindowObserver:
+  void OnWindowBoundsChanged(WmWindow* window,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override;
 
   views::Widget* widget_;
 
   // Parent of |widget_|.
-  wm::WmWindow* widget_parent_;
+  WmWindow* widget_parent_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopBackgroundWidgetController);
 };