ash: Touch-optimize the window-resize region for touch-events only.

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/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_util.h"
 #include "base/logging.h"  // DCHECK
 #include "grit/ui_resources.h"
 #include "grit/ui_resources_standard.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/image_button.h"
@@ skipping 194 matching lines @@
     const gfx::Rect& client_bounds) const {
   return gfx::Rect(std::max(0, client_bounds.x() - kBorderThickness),
                    std::max(0, client_bounds.y() - top_height),
                    client_bounds.width() + (2 * kBorderThickness),
                    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 = ui::GetDisplayLayout() == ui::LAYOUT_TOUCH ?
-      kResizeOutsideBoundsSizeTouch :
-      kResizeOutsideBoundsSize;
+  int outside_bounds = kResizeOutsideBoundsSize;
+
+  if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH &&
+      aura::Env::GetInstance()->is_touch_down()) {
+    outside_bounds = kResizeOutsideBoundsSizeTouch;
+  }
   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.
   bool can_ever_resize = frame_->widget_delegate() ?
       frame_->widget_delegate()->CanResize() :
       false;
@@ skipping 363 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