Shuffles and renames ash/common/wm classes

ash/aura/wm_shell_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_GLOBALS_AURA_H_
-#define ASH_WM_AURA_WM_GLOBALS_AURA_H_
+#ifndef ASH_AURA_WM_SHELL_AURA_H_
+#define ASH_AURA_WM_SHELL_AURA_H_
 
 #include <set>
 
 #include "ash/ash_export.h"
-#include "ash/common/wm/wm_globals.h"
+#include "ash/aura/wm_lookup_aura.h"
+#include "ash/common/wm_shell.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "ash/shell_observer.h"
-#include "ash/wm/aura/wm_lookup_aura.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/wm/public/activation_change_observer.h"
 
 namespace ash {
-namespace wm {
 
-class ASH_EXPORT WmGlobalsAura : public WmGlobals,
-                                 public aura::client::ActivationChangeObserver,
-                                 public WindowTreeHostManager::Observer,
-                                 public ShellObserver {
+class ASH_EXPORT WmShellAura : public WmShell,
+                               public aura::client::ActivationChangeObserver,
+                               public WindowTreeHostManager::Observer,
+                               public ShellObserver {
  public:
-  WmGlobalsAura();
-  ~WmGlobalsAura() override;
+  WmShellAura();
+  ~WmShellAura() override;
 
-  static WmGlobalsAura* Get();
+  static WmShellAura* Get();
 
-  // WmGlobals:
+  // WmShell:
   WmWindow* NewContainerWindow() override;
   WmWindow* GetFocusedWindow() override;
   WmWindow* GetActiveWindow() override;
   WmWindow* GetPrimaryRootWindow() override;
   WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
   WmWindow* GetRootWindowForNewWindows() override;
   std::vector<WmWindow*> GetMruWindowList() override;
   std::vector<WmWindow*> GetMruWindowListIgnoreModals() override;
   bool IsForceMaximizeOnFirstRun() override;
   bool IsUserSessionBlocked() override;
   bool IsScreenLocked() override;
   void LockCursor() override;
   void UnlockCursor() override;
   std::vector<WmWindow*> GetAllRootWindows() override;
-  void RecordUserMetricsAction(WmUserMetricsAction action) override;
+  void RecordUserMetricsAction(wm::WmUserMetricsAction action) override;
   std::unique_ptr<WindowResizer> CreateDragWindowResizer(
       std::unique_ptr<WindowResizer> next_window_resizer,
       wm::WindowState* window_state) override;
   bool IsOverviewModeSelecting() override;
   bool IsOverviewModeRestoringMinimizedWindows() override;
   void AddActivationObserver(WmActivationObserver* observer) override;
   void RemoveActivationObserver(WmActivationObserver* observer) override;
   void AddDisplayObserver(WmDisplayObserver* observer) override;
   void RemoveDisplayObserver(WmDisplayObserver* observer) override;
   void AddOverviewModeObserver(WmOverviewModeObserver* observer) override;
@@ skipping 16 matching lines @@
 
   WmLookupAura wm_lookup_;
   bool added_activation_observer_ = false;
   base::ObserverList<WmActivationObserver> activation_observers_;
 
   bool added_display_observer_ = false;
   base::ObserverList<WmDisplayObserver> display_observers_;
 
   base::ObserverList<WmOverviewModeObserver> overview_mode_observers_;
 
-  DISALLOW_COPY_AND_ASSIGN(WmGlobalsAura);
+  DISALLOW_COPY_AND_ASSIGN(WmShellAura);
 };
 
-}  // namespace wm
 }  // namespace ash
 
-#endif  // ASH_WM_AURA_WM_GLOBALS_AURA_H_
+#endif  // ASH_AURA_WM_SHELL_AURA_H_