Ash: Add hit test bounds override to window inspector

BUG=none
TEST=run chrome --ash-enable-oak, press Ctrl-Shift-F1, verify properties contains the line "Hit test bounds override"

Review URL: https://chromiumcodereview.appspot.com/9706019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126653 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 17 insertions, 0 deletions

diff --git a/ui/aura/window.cc b/ui/aura/window.cc
index a6e2b9d..fdb9145 100644
--- a/ui/aura/window.cc
+++ b/ui/aura/window.cc
@@ -380,6 +380,11 @@ void Window::SetHitTestBoundsOverride(int outer, int inner) {
   hit_test_bounds_override_inner_ = inner;
 }
 
+void Window::GetHitTestBoundsOverride(int* outer, int* inner) {
+  *outer = hit_test_bounds_override_outer_;
+  *inner = hit_test_bounds_override_inner_;
+}
+
 bool Window::ContainsPointInRoot(const gfx::Point& point_in_root) {
   Window* root_window = GetRootWindow();
   if (!root_window)
diff --git a/ui/aura/window.h b/ui/aura/window.h
index 6f6ea8b..9c2703b 100644
--- a/ui/aura/window.h
+++ b/ui/aura/window.h
@@ -236,6 +236,9 @@ class AURA_EXPORT Window : public ui::LayerDelegate {
   // need to have resize edges.  Both |outer| and |inner| must be >= 0.
   void SetHitTestBoundsOverride(int outer, int inner);
 
+  // Returns the hit test bounds override set above.
+  void GetHitTestBoundsOverride(int* outer, int* inner);
+
   // 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.
diff --git a/ui/oak/oak_aura_window_display.cc b/ui/oak/oak_aura_window_display.cc
index afaeb70..214a005 100644
--- a/ui/oak/oak_aura_window_display.cc
+++ b/ui/oak/oak_aura_window_display.cc
@@ -6,6 +6,7 @@
 
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "ui/aura/window.h"
 #include "ui/base/models/table_model_observer.h"
@@ -34,6 +35,7 @@ ROW_USERDATA,
 ROW_STOPSEVENTPROPAGATION,
 ROW_IGNOREEVENTS,
 ROW_CANFOCUS,
+ROW_HITTESTBOUNDSOVERRIDE,
 ROW_COUNT
 };
 
@@ -143,6 +145,13 @@ string16 OakAuraWindowDisplay::GetText(int row, int column_id) {
                               window_->CanReceiveEvents());
     case ROW_CANFOCUS:
       return PropertyWithBool("Can Focus: ", window_->CanFocus());
+    case ROW_HITTESTBOUNDSOVERRIDE: {
+      int outer, inner;
+      window_->GetHitTestBoundsOverride(&outer, &inner);
+      return ASCIIToUTF16(
+          base::StringPrintf("Hit test bounds override: outer %d, inner %d",
+                             outer, inner));
+    }
     default:
       NOTREACHED();
       break;