Makes WorkspaceLayoutManager use ash/wm/common types

ash/wm/aura/wm_window_aura.h

 // Copyright 2016 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.
 
 #ifndef ASH_WM_AURA_WM_WINDOW_AURA_H_
 #define ASH_WM_AURA_WM_WINDOW_AURA_H_
 
 #include "ash/wm/common/wm_window.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
@@ skipping 25 matching lines @@
 
   aura::Window* aura_window() { return window_; }
   const aura::Window* aura_window() const { return window_; }
 
   // WmWindow:
   const WmWindow* GetRootWindow() const override;
   WmRootWindowController* GetRootWindowController() override;
   WmGlobals* GetGlobals() const override;
   void SetName(const std::string& name) override;
   void SetShellWindowId(int id) override;
-  int GetShellWindowId() override;
+  int GetShellWindowId() const override;
   WmWindow* GetChildByShellWindowId(int id) override;
   ui::wm::WindowType GetType() const override;
   ui::Layer* GetLayer() override;
   display::Display GetDisplayNearestWindow() override;
   bool HasNonClientArea() override;
   int GetNonClientComponent(const gfx::Point& location) override;
   gfx::Point ConvertPointToTarget(const WmWindow* target,
                                   const gfx::Point& point) const override;
   gfx::Point ConvertPointToScreen(const gfx::Point& point) const override;
   gfx::Point ConvertPointFromScreen(const gfx::Point& point) const override;
@@ skipping 85 matching lines @@
 
   base::ObserverList<WmWindowObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmWindowAura);
 };
 
 }  // namespace wm
 }  // namespace ash
 
 #endif  // ASH_WM_AURA_WM_WINDOW_AURA_H_