Shuffles and renames ash/common/wm classes

ash/common/wm/switchable_windows.cc

Index: ash/common/wm/switchable_windows.cc
diff --git a/ash/common/wm/switchable_windows.cc b/ash/common/wm/switchable_windows.cc
index dab5b3b36b5a3214be250fcfa8dfe4576b57fcdc..5560560126fbe5052434eb1a404687ab66371fb0 100644
--- a/ash/common/wm/switchable_windows.cc
+++ b/ash/common/wm/switchable_windows.cc
@@ -5,7 +5,7 @@
 #include "ash/common/wm/switchable_windows.h"
 
 #include "ash/common/shell_window_ids.h"
-#include "ash/common/wm/wm_window.h"
+#include "ash/common/wm_window.h"
 
 namespace ash {
 namespace wm {
@@ -18,7 +18,7 @@ const int kSwitchableWindowContainerIds[] = {
 const size_t kSwitchableWindowContainerIdsLength =
     arraysize(kSwitchableWindowContainerIds);
 
-bool IsSwitchableContainer(const wm::WmWindow* window) {
+bool IsSwitchableContainer(const WmWindow* window) {
   if (!window)
     return false;
   const int shell_window_id = window->GetShellWindowId();