chromeos: convert more ash/wm code to aura::Window

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/shell_port.h"
 #include "ash/wm/window_state.h"
+#include "ash/wm/window_util.h"
 #include "ash/wm/wm_event.h"
-#include "ash/wm_window.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event.h"
 
 namespace ash {
 
 WorkspaceEventHandler::WorkspaceEventHandler() : click_component_(HTNOWHERE) {}
 
 WorkspaceEventHandler::~WorkspaceEventHandler() {}
 
 void WorkspaceEventHandler::OnMouseEvent(ui::MouseEvent* event,
-                                         WmWindow* target) {
+                                         aura::Window* target) {
   if (event->type() == ui::ET_MOUSE_PRESSED && event->IsOnlyLeftMouseButton() &&
       ((event->flags() & (ui::EF_IS_DOUBLE_CLICK | ui::EF_IS_TRIPLE_CLICK)) ==
        0)) {
-    click_component_ = target->GetNonClientComponent(event->location());
+    click_component_ = wm::GetNonClientComponent(target, event->location());
   }
 
   if (event->handled())
     return;
 
   switch (event->type()) {
     case ui::ET_MOUSE_MOVED: {
-      int component = target->GetNonClientComponent(event->location());
-      multi_window_resize_controller_.Show(target->aura_window(), component,
+      int component = wm::GetNonClientComponent(target, event->location());
+      multi_window_resize_controller_.Show(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 = target->GetWindowState();
+      wm::WindowState* target_state = wm::GetWindowState(target);
 
       if (event->IsOnlyLeftMouseButton()) {
         if (event->flags() & ui::EF_IS_DOUBLE_CLICK) {
-          int component = target->GetNonClientComponent(event->location());
+          int component = wm::GetNonClientComponent(target, event->location());
           if (component == HTCAPTION && component == click_component_) {
             ShellPort::Get()->RecordUserMetricsAction(
                 UMA_TOGGLE_MAXIMIZE_CAPTION_CLICK);
             const wm::WMEvent wm_event(wm::WM_EVENT_TOGGLE_MAXIMIZE_CAPTION);
             target_state->OnWMEvent(&wm_event);
             event->StopPropagation();
           }
           click_component_ = HTNOWHERE;
         }
       } else {
         click_component_ = HTNOWHERE;
       }
 
       HandleVerticalResizeDoubleClick(target_state, event);
       break;
     }
     default:
       break;
   }
 }
 
 void WorkspaceEventHandler::OnGestureEvent(ui::GestureEvent* event,
-                                           WmWindow* target) {
+                                           aura::Window* target) {
   if (event->handled() || event->type() != ui::ET_GESTURE_TAP)
     return;
 
   int previous_target_component = click_component_;
-  click_component_ = target->GetNonClientComponent(event->location());
+  click_component_ = wm::GetNonClientComponent(target, event->location());
 
   if (click_component_ != HTCAPTION)
     return;
 
   if (event->details().tap_count() != 2) {
     ShellPort::Get()->RecordGestureAction(GESTURE_FRAMEVIEW_TAP);
     return;
   }
 
   if (click_component_ == previous_target_component) {
     ShellPort::Get()->RecordUserMetricsAction(
         UMA_TOGGLE_MAXIMIZE_CAPTION_GESTURE);
     ShellPort::Get()->RecordGestureAction(GESTURE_MAXIMIZE_DOUBLETAP);
     const wm::WMEvent wm_event(wm::WM_EVENT_TOGGLE_MAXIMIZE_CAPTION);
-    target->GetWindowState()->OnWMEvent(&wm_event);
+    wm::GetWindowState(target)->OnWMEvent(&wm_event);
     event->StopPropagation();
   }
   click_component_ = HTNOWHERE;
 }
 
 void WorkspaceEventHandler::HandleVerticalResizeDoubleClick(
     wm::WindowState* target_state,
     ui::MouseEvent* event) {
   aura::Window* target = target_state->window();
   if ((event->flags() & ui::EF_IS_DOUBLE_CLICK) != 0 && target->delegate()) {
-    const int component =
-        target->delegate()->GetNonClientComponent(event->location());
+    const int component = wm::GetNonClientComponent(target, event->location());
     if (component == HTBOTTOM || component == HTTOP) {
       ShellPort::Get()->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) {
       ShellPort::Get()->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