Shuffles and renames ash/common/wm classes

ash/common/wm/wm_toplevel_window_event_handler.h

 // Copyright (c) 2012 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_TOPLEVEL_WINDOW_EVENT_HANDLER_H_
 #define ASH_COMMON_WM_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
-#include "ash/common/wm/wm_display_observer.h"
 #include "ash/common/wm/wm_types.h"
+#include "ash/common/wm_display_observer.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/wm/public/window_move_client.h"
 
 namespace ui {
 class KeyEvent;
 class LocatedEvent;
 class MouseEvent;
 class GestureEvent;
 }
 
 namespace ash {
 
 class WindowResizer;
+class WmShell;
+class WmWindow;
 
 namespace wm {
 
-class WmGlobals;
-class WmWindow;
-
 // WmToplevelWindowEventHandler handles dragging and resizing of top level
 // windows. WmToplevelWindowEventHandler is forwarded events, such as from an
 // EventHandler.
 class ASH_EXPORT WmToplevelWindowEventHandler : public WmDisplayObserver {
  public:
   // Describes what triggered ending the drag.
   enum class DragResult {
     // The drag successfully completed.
     SUCCESS,
 
     REVERT,
 
     // The underlying window was destroyed while the drag is in process.
     WINDOW_DESTROYED
   };
   using EndClosure = base::Callback<void(DragResult)>;
 
-  explicit WmToplevelWindowEventHandler(WmGlobals* globals);
+  explicit WmToplevelWindowEventHandler(WmShell* shell);
   ~WmToplevelWindowEventHandler() override;
 
   void OnKeyEvent(ui::KeyEvent* event);
   void OnMouseEvent(ui::MouseEvent* event, WmWindow* target);
   void OnGestureEvent(ui::GestureEvent* event, WmWindow* target);
 
   // Attempts to start a drag if one is not already in progress. Returns true if
   // successful. |end_closure| is run when the drag completes. |end_closure| is
   // not run if the drag does not start.
   bool AttemptToStartDrag(WmWindow* window,
@@ skipping 34 matching lines @@
   // been completed for fling gestures.
   void SetWindowStateTypeFromGesture(WmWindow* window,
                                      wm::WindowStateType new_state_type);
 
   // Invoked from ScopedWindowResizer if the window is destroyed.
   void ResizerWindowDestroyed();
 
   // WmDisplayObserver:
   void OnDisplayConfigurationChanging() override;
 
-  WmGlobals* globals_;
+  WmShell* shell_;
 
   // The hittest result for the first finger at the time that it initially
   // touched the screen. |first_finger_hittest_| is one of ui/base/hit_test.h
   int first_finger_hittest_;
 
   // The window bounds when the drag was started. When a window is minimized,
   // maximized or snapped via a swipe/fling gesture, the restore bounds should
   // be set to the bounds of the window when the drag was started.
   gfx::Rect pre_drag_window_bounds_;
 
   // Is a window move/resize in progress because of gesture events?
   bool in_gesture_drag_ = false;
 
   std::unique_ptr<ScopedWindowResizer> window_resizer_;
 
   EndClosure end_closure_;
 
   DISALLOW_COPY_AND_ASSIGN(WmToplevelWindowEventHandler);
 };
 
 }  // namespace wm
 }  // namespace ash
 
 #endif  // ASH_COMMON_WM_WM_TOPLEVEL_WINDOW_EVENT_HANDLER_H_