Moves windowsresizers to ash/wm/common

ash/wm/common/dock/docked_window_resizer.cc

 // Copyright 2013 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/wm/dock/docked_window_resizer.h"
+#include "ash/wm/common/dock/docked_window_resizer.h"
 
 #include "ash/wm/common/dock/docked_window_layout_manager.h"
 #include "ash/wm/common/window_parenting_utils.h"
 #include "ash/wm/common/window_state.h"
 #include "ash/wm/common/wm_event.h"
 #include "ash/wm/common/wm_root_window_controller.h"
 #include "ash/wm/common/wm_shell_window_ids.h"
 #include "ash/wm/common/wm_window.h"
-#include "ash/wm/workspace/magnetism_matcher.h"
+#include "ash/wm/common/workspace/magnetism_matcher.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/display/screen.h"
 
 namespace ash {
 namespace {
 
 DockedWindowLayoutManager* GetDockedLayoutManagerAtPoint(
     const gfx::Point& point) {
   display::Display display =
       display::Screen::GetScreen()->GetDisplayNearestPoint(point);
   if (!display.bounds().Contains(point))
     return nullptr;
 
   return DockedWindowLayoutManager::Get(
       wm::WmRootWindowController::GetWithDisplayId(display.id())->GetWindow());
 }
 
 }  // namespace
 
-DockedWindowResizer::~DockedWindowResizer() {
-}
+DockedWindowResizer::~DockedWindowResizer() {}
 
 // static
-DockedWindowResizer*
-DockedWindowResizer::Create(WindowResizer* next_window_resizer,
-                            wm::WindowState* window_state) {
+DockedWindowResizer* DockedWindowResizer::Create(
+    WindowResizer* next_window_resizer,
+    wm::WindowState* window_state) {
   return new DockedWindowResizer(next_window_resizer, window_state);
 }
 
 void DockedWindowResizer::Drag(const gfx::Point& location, int event_flags) {
   last_location_ = GetTarget()->GetParent()->ConvertPointToScreen(location);
   base::WeakPtr<DockedWindowResizer> resizer(weak_ptr_factory_.GetWeakPtr());
 
   if (!did_move_or_resize_) {
     did_move_or_resize_ = true;
     StartedDragging(resizer);
@@ skipping 18 matching lines @@
     // container is the current parent of the window it will be informed of
     // the end of drag when the window is reparented, otherwise let the
     // previous container know the drag is complete. If we told the
     // window's parent that the drag was complete it would begin
     // positioning the window.
     if (is_docked_ && dock_layout_->is_dragged_window_docked())
       dock_layout_->UndockDraggedWindow();
     if (dock_layout_ != initial_dock_layout_)
       dock_layout_->FinishDragging(
           DOCKED_ACTION_NONE,
-          details().source == aura::client::WINDOW_MOVE_SOURCE_MOUSE ?
-              DOCKED_ACTION_SOURCE_MOUSE : DOCKED_ACTION_SOURCE_TOUCH);
+          details().source == aura::client::WINDOW_MOVE_SOURCE_MOUSE
+              ? DOCKED_ACTION_SOURCE_MOUSE
+              : DOCKED_ACTION_SOURCE_TOUCH);
     is_docked_ = false;
     dock_layout_ = new_dock_layout;
     // The window's initial layout manager already knows that the drag is
     // in progress for this window.
     if (new_dock_layout != initial_dock_layout_)
       new_dock_layout->StartDragging(GetTarget());
   }
   // Window could get docked by the WorkspaceWindowResizer, update the state.
   is_docked_ = dock_layout_->is_dragged_window_docked();
   // Whenever a window is dragged out of the dock it will be auto-sized
@@ skipping 132 matching lines @@
   }
   // If a window has restore bounds, update the restore origin but not the size.
   // The size gets restored when a window is undocked.
   if (is_resized && is_docked_ && window_state_->HasRestoreBounds()) {
     gfx::Rect restore_bounds = window->GetBoundsInScreen();
     restore_bounds.set_size(window_state_->GetRestoreBoundsInScreen().size());
     window_state_->SetRestoreBoundsInScreen(restore_bounds);
   }
 
   // Check if the window needs to be docked or returned to workspace.
-  DockedAction action = MaybeReparentWindowOnDragCompletion(is_resized,
-                                                            is_attached_panel);
+  DockedAction action =
+      MaybeReparentWindowOnDragCompletion(is_resized, is_attached_panel);
   dock_layout_->FinishDragging(
       move_result == aura::client::MOVE_CANCELED ? DOCKED_ACTION_NONE : action,
-      details().source == aura::client::WINDOW_MOVE_SOURCE_MOUSE ?
-          DOCKED_ACTION_SOURCE_MOUSE : DOCKED_ACTION_SOURCE_TOUCH);
+      details().source == aura::client::WINDOW_MOVE_SOURCE_MOUSE
+          ? DOCKED_ACTION_SOURCE_MOUSE
+          : DOCKED_ACTION_SOURCE_TOUCH);
 
   // If we started the drag in one root window and moved into another root
   // but then canceled the drag we may need to inform the original layout
   // manager that the drag is finished.
   if (initial_dock_layout_ != dock_layout_)
     initial_dock_layout_->FinishDragging(
         DOCKED_ACTION_NONE,
-        details().source == aura::client::WINDOW_MOVE_SOURCE_MOUSE ?
-            DOCKED_ACTION_SOURCE_MOUSE : DOCKED_ACTION_SOURCE_TOUCH);
+        details().source == aura::client::WINDOW_MOVE_SOURCE_MOUSE
+            ? DOCKED_ACTION_SOURCE_MOUSE
+            : DOCKED_ACTION_SOURCE_TOUCH);
   is_docked_ = false;
 }
 
 DockedAction DockedWindowResizer::MaybeReparentWindowOnDragCompletion(
-    bool is_resized, bool is_attached_panel) {
+    bool is_resized,
+    bool is_attached_panel) {
   wm::WmWindow* window = GetTarget();
 
   // Check if the window needs to be docked or returned to workspace.
   DockedAction action = DOCKED_ACTION_NONE;
   wm::WmWindow* dock_container =
       window->GetRootWindow()->GetChildByShellWindowId(
           kShellWindowId_DockedContainer);
   if ((is_resized || !is_attached_panel) &&
       is_docked_ != (window->GetParent() == dock_container)) {
     if (is_docked_) {
@@ skipping 46 matching lines @@
   } else if (window->GetWindowState()->IsDocked() &&
              action == DOCKED_ACTION_UNDOCK) {
     const wm::WMEvent event(wm::WM_EVENT_NORMAL);
     window_state_->OnWMEvent(&event);
   }
 
   return action;
 }
 
 }  // namespace ash