Shuffles and renames ash/common/wm classes

ash/wm/workspace/workspace_event_handler.cc

 // Copyright (c) 2012 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/workspace/workspace_event_handler.h"
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
-#include "ash/common/wm/wm_window.h"
+#include "ash/common/wm_window.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shell.h"
 #include "ash/touch/touch_uma.h"
-#include "ash/wm/aura/wm_window_aura.h"
 #include "ash/wm/window_state_aura.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
 
 namespace ash {
 
 WorkspaceEventHandler::WorkspaceEventHandler()
     : click_component_(HTNOWHERE) {
 }
@@ skipping 11 matching lines @@
         GetNonClientComponent(event->location());
   }
 
   if (event->handled())
     return;
 
   switch (event->type()) {
     case ui::ET_MOUSE_MOVED: {
       int component =
           target->delegate()->GetNonClientComponent(event->location());
-      multi_window_resize_controller_.Show(wm::WmWindowAura::Get(target),
-                                           component, event->location());
+      multi_window_resize_controller_.Show(WmWindowAura::Get(target), component,
+                                           event->location());
       break;
     }
     case ui::ET_MOUSE_ENTERED:
       break;
     case ui::ET_MOUSE_CAPTURE_CHANGED:
     case ui::ET_MOUSE_EXITED:
       break;
     case ui::ET_MOUSE_PRESSED: {
       wm::WindowState* target_state = wm::GetWindowState(target);
 
@@ skipping 49 matching lines @@
     const wm::WMEvent wm_event(wm::WM_EVENT_TOGGLE_MAXIMIZE_CAPTION);
     wm::GetWindowState(target)->OnWMEvent(&wm_event);
     event->StopPropagation();
   }
   click_component_ = HTNOWHERE;
 }
 
 void WorkspaceEventHandler::HandleVerticalResizeDoubleClick(
     wm::WindowState* target_state,
     ui::MouseEvent* event) {
-  wm::WmWindow* target = target_state->window();
+  WmWindow* target = target_state->window();
   if (event->flags() & ui::EF_IS_DOUBLE_CLICK) {
     int component = target->GetNonClientComponent(event->location());
     if (component == HTBOTTOM || component == HTTOP) {
       Shell::GetInstance()->metrics()->RecordUserMetricsAction(
           UMA_TOGGLE_SINGLE_AXIS_MAXIMIZE_BORDER_CLICK);
       const wm::WMEvent wm_event(wm::WM_EVENT_TOGGLE_VERTICAL_MAXIMIZE);
       target_state->OnWMEvent(&wm_event);
       event->StopPropagation();
     } else if (component == HTLEFT || component == HTRIGHT) {
       Shell::GetInstance()->metrics()->RecordUserMetricsAction(
           UMA_TOGGLE_SINGLE_AXIS_MAXIMIZE_BORDER_CLICK);
       const wm::WMEvent wm_event(wm::WM_EVENT_TOGGLE_HORIZONTAL_MAXIMIZE);
       target_state->OnWMEvent(&wm_event);
       event->StopPropagation();
     }
   }
 }
 
 }  // namespace ash