Shuffles and renames ash/common/wm classes

ash/common/wm/root_window_layout_manager.h

Index: ash/common/wm/root_window_layout_manager.h
diff --git a/ash/common/wm/root_window_layout_manager.h b/ash/common/wm/root_window_layout_manager.h
index 4dfec99ff7afaf9e10531ab19b08cbe26e17d41f..677dfc8231fd8c054434431d17ddc1642ab8a01a 100644
--- a/ash/common/wm/root_window_layout_manager.h
+++ b/ash/common/wm/root_window_layout_manager.h
@@ -5,7 +5,7 @@
 #ifndef ASH_COMMON_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_
 #define ASH_COMMON_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_
 
-#include "ash/common/wm/wm_layout_manager.h"
+#include "ash/common/wm_layout_manager.h"
 #include "base/macros.h"
 
 namespace ash {
@@ -29,7 +29,7 @@ class RootWindowLayoutManager : public WmLayoutManager {
                       const gfx::Rect& requested_bounds) override;
 
  private:
-  wm::WmWindow* owner_;
+  WmWindow* owner_;
 
   DISALLOW_COPY_AND_ASSIGN(RootWindowLayoutManager);
 };