Allow setting different hit test bounds overrides for mouse and touch

ui/aura/window.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 "ui/aura/window.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 726 matching lines @@
                                   bool for_event_handling) {
   if (!IsVisible())
     return NULL;
 
   if ((for_event_handling && !HitTest(local_point)) ||
       (!for_event_handling && !ContainsPoint(local_point)))
     return NULL;
 
   // Check if I should claim this event and not pass it to my children because
   // the location is inside my hit test override area.  For details, see
-  // set_hit_test_bounds_override_inner().
-  if (for_event_handling && !hit_test_bounds_override_inner_.empty()) {
+  // SetHitTestBoundsOverrideInner().
+  gfx::Insets hit_test_bounds_override_inner =
+      aura::Env::GetInstance()->is_touch_down() ?
+      hit_test_bounds_override_inner_touch_ :
+      hit_test_bounds_override_inner_mouse_;
+  if (for_event_handling && !hit_test_bounds_override_inner.empty()) {
     gfx::Rect inset_local_bounds(gfx::Point(), bounds().size());
-    inset_local_bounds.Inset(hit_test_bounds_override_inner_);
+    inset_local_bounds.Inset(hit_test_bounds_override_inner);
     // We know we're inside the normal local bounds, so if we're outside the
     // inset bounds we must be in the special hit test override area.
     DCHECK(HitTest(local_point));
     if (!inset_local_bounds.Contains(local_point))
       return delegate_ ? this : NULL;
   }
 
   if (!return_tightest && delegate_)
     return this;
 
@@ skipping 384 matching lines @@
   bool contains_mouse = false;
   if (IsVisible()) {
     RootWindow* root_window = GetRootWindow();
     contains_mouse = root_window &&
         ContainsPointInRoot(root_window->GetLastMouseLocationInRoot());
   }
   return contains_mouse;
 }
 
 }  // namespace aura