diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 16:09:41 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 16:09:41 +0000 |
| commit | 91931511eb64399174743642d3d26a4b7bffbbde (patch) | |
| tree | 247604860c9738cafd8c631ea5653ce7da59a722 /ui/oak | |
| parent | 53c98dbfd2d362a93088d4b6c776be7ca7cdd6de (diff) | |
| download | chromium_src-91931511eb64399174743642d3d26a4b7bffbbde.zip chromium_src-91931511eb64399174743642d3d26a4b7bffbbde.tar.gz chromium_src-91931511eb64399174743642d3d26a4b7bffbbde.tar.bz2 | |
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
Diffstat (limited to 'ui/oak')
| -rw-r--r-- | ui/oak/oak_aura_window_display.cc | 9 |
1 files changed, 9 insertions, 0 deletions
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; |