Use ui::Event instead of mojom::EventPtr in mash/wm.

mash/wm/frame/move_event_handler.cc

 // 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 "mash/wm/frame/move_event_handler.h"
 
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/interfaces/cursor.mojom.h"
 #include "mash/wm/frame/move_loop.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
@@ skipping 38 matching lines @@
   root_window_->AddObserver(this);
   root_window_->AddPreTargetHandler(this);
 }
 
 MoveEventHandler::~MoveEventHandler() {
   Detach();
 }
 
 void MoveEventHandler::ProcessLocatedEvent(ui::LocatedEvent* event) {
   const bool had_move_loop = move_loop_.get() != nullptr;
-  ui::Event* ui_event = static_cast<ui::Event*>(event);
+  DCHECK(event->IsMouseEvent() || event->IsTouchEvent());
+
+  // TODO(moshayedi): no need for this once MoveEventHandler directly receives
+  // pointer events.
+  scoped_ptr<ui::PointerEvent> pointer_event;
+  if (event->IsMouseEvent())
+    pointer_event.reset(new ui::PointerEvent(*event->AsMouseEvent()));
+  else
+    pointer_event.reset(new ui::PointerEvent(*event->AsTouchEvent()));
+
   if (move_loop_) {
-    if (move_loop_->Move(*mus::mojom::Event::From(*ui_event)) == MoveLoop::DONE)
+    if (move_loop_->Move(*pointer_event.get()) == MoveLoop::DONE)
       move_loop_.reset();
-  } else if (event->type() == ui::ET_MOUSE_PRESSED ||
-             event->type() == ui::ET_TOUCH_PRESSED) {
-    const int ht_location = GetNonClientComponentForEvent(event);
+  } else if (pointer_event->type() == ui::ET_POINTER_DOWN) {
+    const int ht_location = GetNonClientComponentForEvent(pointer_event.get());
     if (ht_location != HTNOWHERE) {
-      // TODO(sky): convert MoveLoop to take ui::Event.
-      move_loop_ = MoveLoop::Create(mus_window_, ht_location,
-                                    *mus::mojom::Event::From(*ui_event));
+      move_loop_ =
+          MoveLoop::Create(mus_window_, ht_location, *pointer_event.get());
     }
-  } else if (event->type() == ui::ET_MOUSE_MOVED) {
-    const int ht_location = GetNonClientComponentForEvent(event);
+  } else if (pointer_event->type() == ui::ET_POINTER_MOVED) {
+    const int ht_location = GetNonClientComponentForEvent(pointer_event.get());
     mus_window_->SetPredefinedCursor(CursorForWindowComponent(ht_location));
   }
   if (had_move_loop || move_loop_)
     event->SetHandled();
 }
 
 int MoveEventHandler::GetNonClientComponentForEvent(
     const ui::LocatedEvent* event) {
   return aura_window_->delegate()->GetNonClientComponent(event->location());
 }
@@ skipping 24 matching lines @@
   event->SetHandled();
 }
 
 void MoveEventHandler::OnWindowDestroying(aura::Window* window) {
   DCHECK_EQ(root_window_, window);
   Detach();
 }
 
 }  // namespace wm
 }  // namespace mash