ash: Use different hit-test outer-region for mouse and touch events.

ash/wm/frame_painter.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/frame_painter.h"
 
 #include "ash/ash_constants.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_util.h"
@@ skipping 163 matching lines @@
       rb.GetImageNamed(IDR_AURA_WINDOW_HEADER_SHADE_TOP).ToImageSkia();
   top_right_corner_ =
       rb.GetImageNamed(IDR_AURA_WINDOW_HEADER_SHADE_TOP_RIGHT).ToImageSkia();
   header_left_edge_ =
       rb.GetImageNamed(IDR_AURA_WINDOW_HEADER_SHADE_LEFT).ToImageSkia();
   header_right_edge_ =
       rb.GetImageNamed(IDR_AURA_WINDOW_HEADER_SHADE_RIGHT).ToImageSkia();
 
   window_ = frame->GetNativeWindow();
   // Ensure we get resize cursors for a few pixels outside our bounds.
-  int outside_bounds = ui::GetDisplayLayout() == ui::LAYOUT_TOUCH ?
-      kResizeOutsideBoundsSizeTouch :
-      kResizeOutsideBoundsSize;
-  window_->set_hit_test_bounds_override_outer(
-      gfx::Insets(-outside_bounds, -outside_bounds,
-                  -outside_bounds, -outside_bounds));
+  window_->SetHitTestBoundsOverrideOuter(
+      gfx::Insets(-kResizeOutsideBoundsSize, -kResizeOutsideBoundsSize,
+                  -kResizeOutsideBoundsSize, -kResizeOutsideBoundsSize),
+      kResizeOutsideBoundsScaleForTouch);
   // Ensure we get resize cursors just inside our bounds as well.
   window_->set_hit_test_bounds_override_inner(
       gfx::Insets(kResizeInsideBoundsSize, kResizeInsideBoundsSize,
                   kResizeInsideBoundsSize, kResizeInsideBoundsSize));
 
   // Watch for maximize/restore/fullscreen state changes.  Observer removes
   // itself in OnWindowDestroying() below, or in the destructor if we go away
   // before the window.
   window_->AddObserver(this);
 }
@@ skipping 17 matching lines @@
                    client_bounds.height() + top_height + kBorderThickness);
 }
 
 int FramePainter::NonClientHitTest(views::NonClientFrameView* view,
                                    const gfx::Point& point) {
   gfx::Rect expanded_bounds = view->bounds();
   int outside_bounds = kResizeOutsideBoundsSize;
 
   if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH &&
       aura::Env::GetInstance()->is_touch_down()) {
-    outside_bounds = kResizeOutsideBoundsSizeTouch;
+    outside_bounds *= kResizeOutsideBoundsScaleForTouch;
   }
   expanded_bounds.Inset(-outside_bounds, -outside_bounds);
 
   if (!expanded_bounds.Contains(point))
     return HTNOWHERE;
 
   // No avatar button.
 
   // Check the frame first, as we allow a small area overlapping the contents
   // to be used for resize handles.
@@ skipping 377 matching lines @@
   for (std::set<FramePainter*>::const_iterator it = instances_->begin();
        it != instances_->end();
        ++it) {
     FramePainter* painter = *it;
     if (IsVisibleNormalWindow(painter->window_))
       painter->frame_->non_client_view()->SchedulePaint();
   }
 }
 
 }  // namespace ash