Shuffles and renames ash/common/wm classes

ash/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_
+#ifndef ASH_AURA_WM_WINDOW_AURA_H_
+#define ASH_AURA_WM_WINDOW_AURA_H_
 
 #include "ash/ash_export.h"
-#include "ash/common/wm/wm_window.h"
+#include "ash/common/wm_window.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/aura/window_observer.h"
 
 namespace ash {
-namespace wm {
 
 // WmWindowAura is tied to the life of the underlying aura::Window.
 class ASH_EXPORT WmWindowAura : public WmWindow, public aura::WindowObserver {
  public:
   explicit WmWindowAura(aura::Window* window);
   // NOTE: this class is owned by the corresponding window. You shouldn't delete
   // TODO(sky): friend deleter and make private.
   ~WmWindowAura() override;
 
   // Returns a WmWindow for an aura::Window, creating if necessary. |window| may
@@ skipping 11 matching lines @@
         GetAuraWindow(const_cast<const WmWindow*>(wm_window)));
   }
   static const aura::Window* GetAuraWindow(const WmWindow* wm_window);
 
   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;
+  WmShell* GetShell() const override;
   void SetName(const char* name) override;
   base::string16 GetTitle() const override;
   void SetShellWindowId(int id) 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;
   gfx::Rect ConvertRectToScreen(const gfx::Rect& rect) const override;
   gfx::Rect ConvertRectFromScreen(const gfx::Rect& rect) const override;
   gfx::Size GetMinimumSize() const override;
   gfx::Size GetMaximumSize() const override;
   bool GetTargetVisibility() const override;
   bool IsVisible() const override;
   void SetOpacity(float opacity) override;
   float GetTargetOpacity() const override;
   void SetTransform(const gfx::Transform& transform) override;
   gfx::Transform GetTargetTransform() const override;
   bool IsSystemModal() const override;
   bool GetBoolProperty(WmWindowProperty key) override;
   int GetIntProperty(WmWindowProperty key) override;
-  const WindowState* GetWindowState() const override;
+  const wm::WindowState* GetWindowState() const override;
   WmWindow* GetToplevelWindow() override;
   void SetParentUsingContext(WmWindow* context,
                              const gfx::Rect& screen_bounds) override;
   void AddChild(WmWindow* window) override;
   WmWindow* GetParent() override;
   const WmWindow* GetTransientParent() const override;
   std::vector<WmWindow*> GetTransientChildren() override;
   void SetLayoutManager(
       std::unique_ptr<WmLayoutManager> layout_manager) override;
   WmLayoutManager* GetLayoutManager() override;
@@ skipping 76 matching lines @@
   void OnWindowVisibilityChanging(aura::Window* window, bool visible) override;
   void OnWindowTitleChanged(aura::Window* window) override;
 
   aura::Window* window_;
 
   base::ObserverList<WmWindowObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmWindowAura);
 };
 
-}  // namespace wm
 }  // namespace ash
 
-#endif  // ASH_WM_AURA_WM_WINDOW_AURA_H_
+#endif  // ASH_AURA_WM_WINDOW_AURA_H_