diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 16:52:41 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 16:52:41 +0000 |
| commit | b227ed707ed9a16bd071098a1500a182ea83a652 (patch) | |
| tree | 5e16c700fee1b57130e51226d619824fa3d7f83f /ui/oak | |
| parent | 7d733b43e51d53a70e5e8062e485b5cd533c25a8 (diff) | |
| download | chromium_src-b227ed707ed9a16bd071098a1500a182ea83a652.zip chromium_src-b227ed707ed9a16bd071098a1500a182ea83a652.tar.gz chromium_src-b227ed707ed9a16bd071098a1500a182ea83a652.tar.bz2 | |
Revert 128503 - Remove stops_event_propagation from Window, since it's broken.
Changes it to be implemented by the Aura client, via a new interface EventClient.
The client can determine whether or not a given window and its subtree can receive events.
I also cleaned up the way screen locking is entered/exited via the delegate, and some stuff in ash/shell.
http://crbug.com/119347
TEST=none
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=128328
Review URL: https://chromiumcodereview.appspot.com/9788001
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9808068
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128508 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/oak')
| -rw-r--r-- | ui/oak/oak_aura_window_display.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/oak/oak_aura_window_display.cc b/ui/oak/oak_aura_window_display.cc index fce9406..214a005 100644 --- a/ui/oak/oak_aura_window_display.cc +++ b/ui/oak/oak_aura_window_display.cc @@ -32,6 +32,7 @@ ROW_ROOTWINDOW, ROW_TRANSIENTCHILDREN, ROW_TRANSIENTPARENT, ROW_USERDATA, +ROW_STOPSEVENTPROPAGATION, ROW_IGNOREEVENTS, ROW_CANFOCUS, ROW_HITTESTBOUNDSOVERRIDE, @@ -136,6 +137,9 @@ string16 OakAuraWindowDisplay::GetText(int row, int column_id) { window_->transient_parent()); case ROW_USERDATA: return PropertyWithVoidStar("User Data: ", window_->user_data()); + case ROW_STOPSEVENTPROPAGATION: + return PropertyWithBool("Stops event propagation: ", + window_->StopsEventPropagation()); case ROW_IGNOREEVENTS: return PropertyWithBool("Can receive events: ", window_->CanReceiveEvents()); |