Allow setting different hit test bounds overrides for mouse and touch

ui/aura/window.h

 // 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.
 
 #ifndef UI_AURA_WINDOW_H_
 #define UI_AURA_WINDOW_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 236 matching lines @@
   }
 
   gfx::Insets hit_test_bounds_override_outer_touch() const {
     return hit_test_bounds_override_outer_touch_;
   }
 
   gfx::Insets hit_test_bounds_override_outer_mouse() const {
     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,

[Ben Goodger (Google), 2013/10/17 23:04:48]

Can we try and remove this from Window?

I'm trying to slim down Aura and I wonder if this is something that could be
carried as a property.

+                                     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() const {
-    return hit_test_bounds_override_inner_;
+
+  gfx::Insets hit_test_bounds_override_inner_touch() const {
+    return hit_test_bounds_override_inner_touch_;
+  }
+
+  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
   // within this window's bounds. Returns false if the window is detached
   // from root window.
   bool ContainsPointInRoot(const gfx::Point& point_in_root) const;
 
   // Returns true if relative-to-this-Window's-origin |local_point| falls
   // within this Window's bounds.
   bool ContainsPoint(const gfx::Point& local_point) const;
@@ skipping 234 matching lines @@
   bool transparent_;
 
   scoped_ptr<ui::EventHandler> event_filter_;
   scoped_ptr<LayoutManager> layout_manager_;
 
   void* user_data_;
 
   // 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_;
 
   // Value struct to keep the name and deallocator for this property.
   // Key cannot be used for this purpose because it can be char* or
   // WindowProperty<>.
   struct Value {
     const char* name;
     int64 value;
     PropertyDeallocator deallocator;
   };
 
   std::map<const void*, Value> prop_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_H_