Moves move logic into WM instead of WS

components/mus/example/wm/window_manager_impl.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 "components/mus/example/wm/window_manager_impl.h"
 
 #include "components/mus/example/wm/container.h"
+#include "components/mus/example/wm/move_loop.h"
 #include "components/mus/example/wm/window_manager_application.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/types.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
+#include "ui/mojo/events/input_events.mojom.h"
+
+namespace {
+
+bool IsPointerEvent(const mojo::Event& event) {
+  return event.action == mojo::EVENT_TYPE_POINTER_CANCEL ||
+         event.action == mojo::EVENT_TYPE_POINTER_DOWN ||
+         event.action == mojo::EVENT_TYPE_POINTER_MOVE ||
+         event.action == mojo::EVENT_TYPE_POINTER_UP;
+}
+
+}  // namespace
 
 WindowManagerImpl::WindowManagerImpl(WindowManagerApplication* state)
     : state_(state) {}
 
-WindowManagerImpl::~WindowManagerImpl() {}
+WindowManagerImpl::~WindowManagerImpl() {
+  mus::Window* parent = state_->GetWindowForContainer(Container::USER_WINDOWS);
+  if (!parent)
+    return;
+
+  for (mus::Window* child : parent->children())
+    child->RemoveObserver(this);
+}
 
 void WindowManagerImpl::OpenWindow(mus::mojom::WindowTreeClientPtr client) {
   mus::Window* root = state_->root();
   DCHECK(root);
 
   const int width = (root->bounds().width - 240);
   const int height = (root->bounds().height - 240);
 
   mus::Window* child_window = root->connection()->NewWindow();
   mojo::Rect bounds;
   bounds.x = 40 + (state_->window_count() % 4) * 40;
   bounds.y = 40 + (state_->window_count() % 4) * 40;
   bounds.width = width;
   bounds.height = height;
   child_window->SetBounds(bounds);
   state_->GetWindowForContainer(Container::USER_WINDOWS)
       ->AddChild(child_window);
   child_window->Embed(client.Pass());
+  child_window->AddObserver(this);
 
   state_->IncrementWindowCount();
 }
 
 void WindowManagerImpl::SetPreferredSize(
     mus::Id window_id,
     mojo::SizePtr size,
     const WindowManagerErrorCodeCallback& callback) {
   mus::Window* window = state_->GetWindowById(window_id);
   window->SetSharedProperty<mojo::Size>(
@@ skipping 27 matching lines @@
   displays[0]->id = 2001;
   displays[0]->bounds = mojo::Rect::New();
   displays[0]->bounds->y = 0;
   displays[0]->bounds->width = state_->root()->bounds().width;
   displays[0]->bounds->height = state_->root()->bounds().width;
   displays[0]->work_area = displays[0]->bounds.Clone();
   displays[0]->device_pixel_ratio =
       state_->root()->viewport_metrics().device_pixel_ratio;
   callback.Run(displays.Pass());
 }
+
+void WindowManagerImpl::OnWindowDestroyed(mus::Window* window) {
+  window->RemoveObserver(this);
+}
+
+void WindowManagerImpl::OnWindowInputEvent(mus::Window* window,
+                                           const mojo::EventPtr& event) {
+  if (move_loop_ && IsPointerEvent(*event)) {
+    if (move_loop_->Move(*event) == MoveLoop::DONE)
+      move_loop_.reset();
+    return;
+  }
+  if (!move_loop_ && event->action == mojo::EVENT_TYPE_POINTER_DOWN)
+    move_loop_ = MoveLoop::Create(window, *event);
+}