Moves most frame related classes to ash/common/frame

ash/common/frame/frame_border_hit_test.cc

-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2016 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/frame/frame_border_hit_test_controller.h"
-
-#include <memory>
+#include "ash/common/frame/frame_border_hit_test.h"
 
 #include "ash/common/ash_constants.h"
-#include "ash/common/wm/window_state_observer.h"
-#include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
-#include "ash/wm/resize_handle_window_targeter.h"
-#include "ui/aura/env.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_observer.h"
-#include "ui/aura/window_targeter.h"
+#include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
+#include "ash/common/wm_shell.h"
 #include "ui/base/hit_test.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/non_client_view.h"
 
 namespace ash {
 
-FrameBorderHitTestController::FrameBorderHitTestController(views::Widget* frame)
-    : frame_window_(frame->GetNativeWindow()) {
-  frame_window_->SetEventTargeter(std::unique_ptr<ui::EventTargeter>(
-      new ResizeHandleWindowTargeter(frame_window_, NULL)));
-}
-
-FrameBorderHitTestController::~FrameBorderHitTestController() {}
-
-// static
-int FrameBorderHitTestController::NonClientHitTest(
+int FrameBorderNonClientHitTest(
     views::NonClientFrameView* view,
     FrameCaptionButtonContainerView* caption_button_container,
     const gfx::Point& point_in_widget) {
   gfx::Rect expanded_bounds = view->bounds();
   int outside_bounds = kResizeOutsideBoundsSize;
 
-  if (aura::Env::GetInstance()->is_touch_down())
+  if (WmShell::Get()->IsTouchDown())
     outside_bounds *= kResizeOutsideBoundsScaleForTouch;
   expanded_bounds.Inset(-outside_bounds, -outside_bounds);
 
   if (!expanded_bounds.Contains(point_in_widget))
     return HTNOWHERE;
 
   // Check the frame first, as we allow a small area overlapping the contents
   // to be used for resize handles.
   views::Widget* frame = view->GetWidget();
   bool can_ever_resize = frame->widget_delegate()->CanResize();
@@ skipping 23 matching lines @@
         point_in_caption_button_container);
     if (caption_button_component != HTNOWHERE)
       return caption_button_component;
   }
 
   // Caption is a safe default.
   return HTCAPTION;
 }
 
 }  // namespace ash