Shuffles and renames ash/common/wm classes

ash/common/wm_window.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_COMMON_WM_WM_WINDOW_H_
-#define ASH_COMMON_WM_WM_WINDOW_H_
+#ifndef ASH_COMMON_WM_WINDOW_H_
+#define ASH_COMMON_WM_WINDOW_H_
 
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/compositor/layer_animation_element.h"
 #include "ui/wm/core/window_animations.h"
 #include "ui/wm/public/window_types.h"
 
 namespace display {
 class Display;
 }
 
 namespace gfx {
 class Point;
 class Rect;
 class Size;
 class Transform;
 }
 
 namespace ui {
 class Layer;
 }
 
 namespace ash {
-namespace wm {
 
-class WMEvent;
-class WmGlobals;
 class WmLayoutManager;
 class WmRootWindowController;
+class WmShell;
 class WmWindowObserver;
 enum class WmWindowProperty;
+
+namespace wm {
+class WMEvent;
 class WindowState;
+}
 
 // This class exists as a porting layer to allow ash/wm to work with
 // aura::Window or mus::Window. See aura::Window for details on the functions.
 class ASH_EXPORT WmWindow {
  public:
   // See comments in SetBoundsInScreen().
   enum class BoundsInScreenBehavior {
     USE_LOCAL_COORDINATES,
     USE_SCREEN_COORDINATES,
   };
 
   WmWindow* GetRootWindow() {
     return const_cast<WmWindow*>(
         const_cast<const WmWindow*>(this)->GetRootWindow());
   }
   virtual const WmWindow* GetRootWindow() const = 0;
   virtual WmRootWindowController* GetRootWindowController() = 0;
 
   // TODO(sky): fix constness.
-  virtual WmGlobals* GetGlobals() const = 0;
+  virtual WmShell* GetShell() const = 0;

[James Cook, 2016/06/03 20:10:47]

Not for this CL: Do you think we'll need this going forward? It seems like
everyone will just end up calling WmShell::Get().

[sky, 2016/06/03 20:13:47]

Agreed.

 
   // Used for debugging.
   virtual void SetName(const char* name) = 0;
 
   virtual base::string16 GetTitle() const = 0;
 
   // See shell_window_ids.h for list of known ids.
   virtual void SetShellWindowId(int id) = 0;
   virtual int GetShellWindowId() const = 0;
   virtual WmWindow* GetChildByShellWindowId(int id) = 0;
@@ skipping 29 matching lines @@
   virtual float GetTargetOpacity() const = 0;
 
   virtual void SetTransform(const gfx::Transform& transform) = 0;
   virtual gfx::Transform GetTargetTransform() const = 0;
 
   virtual bool IsSystemModal() const = 0;
 
   virtual bool GetBoolProperty(WmWindowProperty key) = 0;
   virtual int GetIntProperty(WmWindowProperty key) = 0;
 
-  WindowState* GetWindowState() {
-    return const_cast<WindowState*>(
+  wm::WindowState* GetWindowState() {
+    return const_cast<wm::WindowState*>(
         const_cast<const WmWindow*>(this)->GetWindowState());
   }
-  virtual const WindowState* GetWindowState() const = 0;
+  virtual const wm::WindowState* GetWindowState() const = 0;
 
   virtual WmWindow* GetToplevelWindow() = 0;
 
   // See aura::client::ParentWindowWithContext() for details of what this does.
   virtual void SetParentUsingContext(WmWindow* context,
                                      const gfx::Rect& screen_bounds) = 0;
   virtual void AddChild(WmWindow* window) = 0;
 
   virtual WmWindow* GetParent() = 0;
 
@@ skipping 122 matching lines @@
   // container. This is used by SetBoundsInScreen().
   virtual void SetDescendantsStayInSameRootWindow(bool value) = 0;
 
   virtual void AddObserver(WmWindowObserver* observer) = 0;
   virtual void RemoveObserver(WmWindowObserver* observer) = 0;
 
  protected:
   virtual ~WmWindow() {}
 };
 
-}  // namespace wm
 }  // namespace ash
 
-#endif  // ASH_COMMON_WM_WM_WINDOW_H_
+#endif  // ASH_COMMON_WM_WINDOW_H_