Allow setting different hit test bounds overrides for mouse and touch

ui/aura/window.h

Index: ui/aura/window.h
diff --git a/ui/aura/window.h b/ui/aura/window.h
index 2d182b948f6943fc944bbd437a8b9a8153c27fe1..f0c2ab6aa21bcc8a512ccb3f46dbeb7bb3e58aa0 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -254,14 +254,22 @@ class AURA_EXPORT Window : public ui::LayerDelegate,
     return hit_test_bounds_override_outer_mouse_;
   }
 
-  // Sets the window to grab hits for an area extending |insets| pixels inside
-  // its bounds (even if that inner region overlaps a child window). This can be
-  // used to create an invisible non-client area that overlaps the client area.
-  void set_hit_test_bounds_override_inner(const gfx::Insets& insets) {
-    hit_test_bounds_override_inner_ = insets;
+  // Sets the window to grab hits for mouse and touch for an area extending
+  // |mouse_insets| and |touch_insets| pixels inside its bounds (even if that
+  // inner region overlaps a child window). This can be used to create an
+  // invisible non-client area that overlaps the client area.
+  void SetHitTestBoundsOverrideInner(const gfx::Insets& mouse_insets,
+                                     const gfx::Insets& touch_insets) {
+    hit_test_bounds_override_inner_mouse_ = mouse_insets;
+    hit_test_bounds_override_inner_touch_ = touch_insets;
+  }
+
+  gfx::Insets hit_test_bounds_override_inner_touch() const {
+    return hit_test_bounds_override_inner_touch_;
   }
-  gfx::Insets hit_test_bounds_override_inner() const {
-    return hit_test_bounds_override_inner_;
+
+  gfx::Insets hit_test_bounds_override_inner_mouse() const {
+    return hit_test_bounds_override_inner_mouse_;
   }
 
   // Returns true if the |point_in_root| in root window's coordinate falls
@@ -516,10 +524,11 @@ class AURA_EXPORT Window : public ui::LayerDelegate,
   // Makes the window pass all events through to any windows behind it.
   bool ignore_events_;
 
-  // See set_hit_test_outer_override().
+  // See SetHitTestBoundsOverrideOuter() and SetHitTestBoundsOverrideInner().
   gfx::Insets hit_test_bounds_override_outer_mouse_;
   gfx::Insets hit_test_bounds_override_outer_touch_;
-  gfx::Insets hit_test_bounds_override_inner_;
+  gfx::Insets hit_test_bounds_override_inner_mouse_;
+  gfx::Insets hit_test_bounds_override_inner_touch_;
 
   ObserverList<WindowObserver> observers_;