Converts mash to use the common non-client frame

ash/mus/frame/move_event_handler.cc

Index: ash/mus/frame/move_event_handler.cc
diff --git a/ash/mus/frame/move_event_handler.cc b/ash/mus/frame/move_event_handler.cc
deleted file mode 100644
index ea3bd4235d0e4bc1f404e054301f3a45677e140b..0000000000000000000000000000000000000000
--- a/ash/mus/frame/move_event_handler.cc
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2015 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.
-
-#include "ash/mus/frame/move_event_handler.h"
-
-#include "ash/mus/bridge/wm_window_mus.h"
-#include "services/ui/public/cpp/window.h"
-#include "services/ui/public/cpp/window_manager_delegate.h"
-#include "services/ui/public/cpp/window_property.h"
-#include "services/ui/public/interfaces/cursor.mojom.h"
-#include "ui/aura/window.h"
-#include "ui/base/hit_test.h"
-#include "ui/events/event.h"
-
-MUS_DECLARE_WINDOW_PROPERTY_TYPE(ash::mus::MoveEventHandler*)
-
-namespace {
-
-// Key used for storing identifier sent to clients for windows.
-MUS_DEFINE_LOCAL_WINDOW_PROPERTY_KEY(ash::mus::MoveEventHandler*,
-                                     kWmMoveEventHandler,
-                                     nullptr);
-
-}  // namespace
-
-namespace ash {
-namespace mus {
-namespace {
-
-ui::mojom::Cursor CursorForWindowComponent(int window_component) {
-  switch (window_component) {
-    case HTBOTTOM:
-      return ui::mojom::Cursor::SOUTH_RESIZE;
-    case HTBOTTOMLEFT:
-      return ui::mojom::Cursor::SOUTH_WEST_RESIZE;
-    case HTBOTTOMRIGHT:
-      return ui::mojom::Cursor::SOUTH_EAST_RESIZE;
-    case HTLEFT:
-      return ui::mojom::Cursor::WEST_RESIZE;
-    case HTRIGHT:
-      return ui::mojom::Cursor::EAST_RESIZE;
-    case HTTOP:
-      return ui::mojom::Cursor::NORTH_RESIZE;
-    case HTTOPLEFT:
-      return ui::mojom::Cursor::NORTH_WEST_RESIZE;
-    case HTTOPRIGHT:
-      return ui::mojom::Cursor::NORTH_EAST_RESIZE;
-    default:
-      return ui::mojom::Cursor::CURSOR_NULL;
-  }
-}
-
-void OnMoveLoopCompleted(const base::Callback<void(bool success)>& end_closure,
-                         wm::WmToplevelWindowEventHandler::DragResult result) {
-  end_closure.Run(result ==
-                  wm::WmToplevelWindowEventHandler::DragResult::SUCCESS);
-}
-
-}  // namespace
-
-MoveEventHandler::MoveEventHandler(
-    ui::Window* mus_window,
-    ui::WindowManagerClient* window_manager_client,
-    aura::Window* aura_window)
-    : wm_window_(WmWindowMus::Get(mus_window)),
-      window_manager_client_(window_manager_client),
-      root_window_(aura_window->GetRootWindow()),
-      toplevel_window_event_handler_(wm_window_->GetShell()) {
-  root_window_->AddObserver(this);
-  root_window_->AddPreTargetHandler(this);
-
-  mus_window->SetLocalProperty(kWmMoveEventHandler, this);
-}
-
-MoveEventHandler::~MoveEventHandler() {
-  Detach();
-}
-
-// static
-MoveEventHandler* MoveEventHandler::GetForWindow(WmWindow* wm_window) {
-  return WmWindowMus::GetMusWindow(wm_window)->GetLocalProperty(
-      kWmMoveEventHandler);
-}
-
-void MoveEventHandler::AttemptToStartDrag(
-    const gfx::Point& point_in_parent,
-    int window_component,
-    aura::client::WindowMoveSource source,
-    const base::Callback<void(bool success)>& end_closure) {
-  toplevel_window_event_handler_.AttemptToStartDrag(
-      wm_window_, point_in_parent, window_component, source,
-      base::Bind(&OnMoveLoopCompleted, end_closure));
-}
-
-bool MoveEventHandler::IsDragInProgress() {
-  return toplevel_window_event_handler_.is_drag_in_progress();
-}
-
-void MoveEventHandler::RevertDrag() {
-  toplevel_window_event_handler_.RevertDrag();
-}
-
-void MoveEventHandler::Detach() {
-  if (!root_window_)
-    return;
-
-  root_window_->RemoveObserver(this);
-  root_window_->RemovePreTargetHandler(this);
-  root_window_ = nullptr;
-}
-
-void MoveEventHandler::OnMouseEvent(ui::MouseEvent* event) {
-  toplevel_window_event_handler_.OnMouseEvent(event, wm_window_);
-  if (!toplevel_window_event_handler_.is_drag_in_progress() &&
-      (event->type() == ui::ET_POINTER_MOVED ||
-       event->type() == ui::ET_MOUSE_MOVED)) {
-    const int hit_test_location =
-        wm_window_->GetNonClientComponent(event->location());
-    window_manager_client_->SetNonClientCursor(
-        wm_window_->mus_window(), CursorForWindowComponent(hit_test_location));
-  }
-}
-
-void MoveEventHandler::OnGestureEvent(ui::GestureEvent* event) {
-  toplevel_window_event_handler_.OnGestureEvent(event, wm_window_);
-}
-
-void MoveEventHandler::OnCancelMode(ui::CancelModeEvent* event) {
-  toplevel_window_event_handler_.RevertDrag();
-}
-
-void MoveEventHandler::OnWindowDestroying(aura::Window* window) {
-  DCHECK_EQ(root_window_, window);
-  Detach();
-}
-
-}  // namespace mus
-}  // namespace ash