Makes WorkspaceLayoutManager use ash/wm/common types

ash/wm/common/switchable_windows.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/switchable_windows.h"
+#include "ash/wm/common/switchable_windows.h"
 
-#include "ash/shell_window_ids.h"
-#include "ui/aura/window.h"
+#include "ash/wm/common/wm_shell_window_ids.h"
+#include "ash/wm/common/wm_window.h"
 
 namespace ash {
+namespace wm {
 
 const int kSwitchableWindowContainerIds[] = {
-    kShellWindowId_DefaultContainer,

[sky, 2016/04/27 20:48:05]

I think this looks better, but I ran 'git cl format' and you can see the result.

[James Cook, 2016/04/27 23:24:24]

Yeah. I'm OK with the new formatting, and I'm also OK with changing it back. I
sometimes overrule 'git cl format' when it does egregious things, but that can
be a losing battle in the long run. Up to you.

-    kShellWindowId_AlwaysOnTopContainer,
-    kShellWindowId_DockedContainer,
-    kShellWindowId_PanelContainer,
+    kShellWindowId_DefaultContainer, kShellWindowId_AlwaysOnTopContainer,
+    kShellWindowId_DockedContainer, kShellWindowId_PanelContainer,
     kShellWindowId_AppListContainer};
 
 const size_t kSwitchableWindowContainerIdsLength =
     arraysize(kSwitchableWindowContainerIds);
 
-bool IsSwitchableContainer(const aura::Window* window) {
+bool IsSwitchableContainer(const wm::WmWindow* window) {
   if (!window)
     return false;
+  const int shell_window_id = window->GetShellWindowId();
   for (size_t i = 0; i < kSwitchableWindowContainerIdsLength; ++i) {
-    if (window->id() == kSwitchableWindowContainerIds[i])
+    if (shell_window_id == kSwitchableWindowContainerIds[i])
       return true;
   }
   return false;
 }
 
+}  // namespace wm
 }  // namespace ash