Shuffles and renames ash/common/wm classes

ash/common/wm/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/common/wm/dock/docked_window_resizer.h"
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/dock/docked_window_layout_manager.h"
 #include "ash/common/wm/window_parenting_utils.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
-#include "ash/common/wm/wm_lookup.h"
-#include "ash/common/wm/wm_root_window_controller.h"
-#include "ash/common/wm/wm_window.h"
 #include "ash/common/wm/workspace/magnetism_matcher.h"
+#include "ash/common/wm_lookup.h"
+#include "ash/common/wm_root_window_controller.h"
+#include "ash/common/wm_window.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/display/display.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::WmLookup::Get()
+      WmLookup::Get()
           ->GetRootWindowControllerWithDisplayId(display.id())
           ->GetWindow());
 }
 
 }  // namespace
 
 DockedWindowResizer::~DockedWindowResizer() {}
 
 // static
 DockedWindowResizer* DockedWindowResizer::Create(
@@ skipping 136 matching lines @@
   if (!resizer)
     return;
   // Reparent workspace windows during the drag to elevate them above workspace.
   // Other windows for which the DockedWindowResizer is instantiated include
   // panels and windows that are already docked. Those do not need reparenting.
   if (GetTarget()->GetType() != ui::wm::WINDOW_TYPE_PANEL &&
       GetTarget()->GetParent()->GetShellWindowId() ==
           kShellWindowId_DefaultContainer) {
     // Reparent the window into the docked windows container in order to get it
     // on top of other docked windows.
-    wm::WmWindow* docked_container =
+    WmWindow* docked_container =
         GetTarget()->GetRootWindow()->GetChildByShellWindowId(
             kShellWindowId_DockedContainer);
-    ReparentChildWithTransientChildren(GetTarget(), GetTarget()->GetParent(),
-                                       docked_container);
+    wm::ReparentChildWithTransientChildren(
+        GetTarget(), GetTarget()->GetParent(), docked_container);
     if (!resizer)
       return;
   }
   if (is_docked_)
     dock_layout_->DockDraggedWindow(GetTarget());
 }
 
 void DockedWindowResizer::FinishedDragging(
     aura::client::WindowMoveResult move_result) {
   if (!did_move_or_resize_)
     return;
   did_move_or_resize_ = false;
-  wm::WmWindow* window = GetTarget();
+  WmWindow* window = GetTarget();
   const bool is_attached_panel =
       window->GetType() == ui::wm::WINDOW_TYPE_PANEL &&
       window_state_->panel_attached();
   const bool is_resized =
       (details().bounds_change & WindowResizer::kBoundsChange_Resizes) != 0;
 
   // Undock the window if it is not in the normal, docked or minimized state
   // type. This happens if a user snaps or maximizes a window using a
   // keyboard shortcut while it is being dragged.
   if (!window_state_->IsMinimized() && !window_state_->IsDocked() &&
@@ skipping 34 matching lines @@
         DOCKED_ACTION_NONE,
         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) {
-  wm::WmWindow* window = GetTarget();
+  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);
+  WmWindow* dock_container = window->GetRootWindow()->GetChildByShellWindowId(
+      kShellWindowId_DockedContainer);
   if ((is_resized || !is_attached_panel) &&
       is_docked_ != (window->GetParent() == dock_container)) {
     if (is_docked_) {
       wm::ReparentChildWithTransientChildren(window, window->GetParent(),
                                              dock_container);
       action = DOCKED_ACTION_DOCK;
     } else if (window->GetParent()->GetShellWindowId() ==
                kShellWindowId_DockedContainer) {
       // Reparent the window back to workspace.
       // We need to be careful to give ParentWindowWithContext a location in
       // the right root window (matching the logic in DragWindowResizer) based
       // on which root window a mouse pointer is in. We want to undock into the
       // right screen near the edge of a multiscreen setup (based on where the
       // mouse is).
       gfx::Rect near_last_location(last_location_, gfx::Size());
       // Reparenting will cause Relayout and possible dock shrinking.
-      wm::WmWindow* previous_parent = window->GetParent();
+      WmWindow* previous_parent = window->GetParent();
       window->SetParentUsingContext(window, near_last_location);
       if (window->GetParent() != previous_parent) {
         wm::ReparentTransientChildrenOfChild(window, previous_parent,
                                              window->GetParent());
       }
       action = was_docked_ ? DOCKED_ACTION_UNDOCK : DOCKED_ACTION_NONE;
     }
   } else {
     // |action| is recorded in UMA and used to maintain |window_state_|.
     if (is_resized && is_docked_ && was_docked_)
@@ skipping 22 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