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

chrome/browser/ui/views/extensions/shell_window_views.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 "chrome/browser/ui/views/extensions/shell_window_views.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/common/extensions/draggable_region.h"
 #include "chrome/common/extensions/extension.h"
@@ skipping 19 matching lines @@
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "ui/base/win/shell.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/ash_constants.h"
 #include "ash/wm/custom_frame_view_ash.h"
+#include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #endif
 
 namespace {
 #if !defined(USE_ASH)
 const int kResizeInsideBoundsSize = 5;
 const int kResizeAreaCornerSize = 16;
 #endif
 
 // Height of the chrome-style caption, in pixels.
@@ skipping 64 matching lines @@
     close_button_->SetImage(views::CustomButton::BS_PUSHED,
         rb.GetNativeImageNamed(IDR_CLOSE_BAR_P).ToImageSkia());
     close_button_->SetAccessibleName(
         l10n_util::GetStringUTF16(IDS_APP_ACCNAME_CLOSE));
     AddChildView(close_button_);
   }
 
 #if defined(USE_ASH)
   aura::Window* window = frame->GetNativeWindow();
   // Ensure we get resize cursors for a few pixels outside our bounds.
-  int outside_bounds = ui::GetDisplayLayout() == ui::LAYOUT_TOUCH ?
-      ash::kResizeOutsideBoundsSizeTouch :
-      ash::kResizeOutsideBoundsSize;
-  window->set_hit_test_bounds_override_outer(
-      gfx::Insets(-outside_bounds, -outside_bounds,
-                  -outside_bounds, -outside_bounds));
+  window->SetHitTestBoundsOverrideOuter(
+      gfx::Insets(-ash::kResizeOutsideBoundsSize,
+                  -ash::kResizeOutsideBoundsSize,
+                  -ash::kResizeOutsideBoundsSize,
+                  -ash::kResizeOutsideBoundsSize),
+      ash::kResizeOutsideBoundsScaleForTouch);
   // Ensure we get resize cursors just inside our bounds as well.
   // TODO(jeremya): do we need to update these when in fullscreen/maximized?
   window->set_hit_test_bounds_override_inner(
       gfx::Insets(ash::kResizeInsideBoundsSize, ash::kResizeInsideBoundsSize,
                   ash::kResizeInsideBoundsSize, ash::kResizeInsideBoundsSize));
 #endif
 }
 
 gfx::Rect ShellWindowFrameView::GetBoundsForClientView() const {
   if (window_->frameless() || frame_->IsFullscreen())
@@ skipping 15 matching lines @@
                    std::max(header_width, client_bounds.width()),
                    client_bounds.height() + kCaptionHeight);
 }
 
 int ShellWindowFrameView::NonClientHitTest(const gfx::Point& point) {
   if (frame_->IsFullscreen())
     return HTCLIENT;
 
 #if defined(USE_ASH)
   gfx::Rect expanded_bounds = bounds();
-  int outside_bounds = ui::GetDisplayLayout() == ui::LAYOUT_TOUCH ?
-      ash::kResizeOutsideBoundsSizeTouch :
-      ash::kResizeOutsideBoundsSize;
+  int outside_bounds = ash::kResizeOutsideBoundsSize;
+  if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH &&
+      aura::Env::GetInstance()->is_touch_down()) {
+    outside_bounds *= ash::kResizeOutsideBoundsScaleForTouch;
+  }
   expanded_bounds.Inset(-outside_bounds, -outside_bounds);
   if (!expanded_bounds.Contains(point))
     return HTNOWHERE;
 
   int kResizeInsideBoundsSize = ash::kResizeInsideBoundsSize;
   int kResizeAreaCornerSize = ash::kResizeAreaCornerSize;
 #endif
 
   // Check the frame first, as we allow a small area overlapping the contents
   // to be used for resize handles.
@@ skipping 398 matching lines @@
   OnViewWasResized();
 }
 
 // static
 ShellWindow* ShellWindow::CreateImpl(Profile* profile,
                                      const extensions::Extension* extension,
                                      const GURL& url,
                                      const ShellWindow::CreateParams& params) {
   return new ShellWindowViews(profile, extension, url, params);
 }