diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-22 22:48:50 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-22 22:48:50 +0000 |
| commit | 9d9ac7657928ab1f0dc219f7c4bd857f1986ba9d (patch) | |
| tree | 04ae74c8391f19e76aac6471363efe1321c0f360 /ui/oak | |
| parent | 452dc95ddca95d10700dcd51542b50725db355a6 (diff) | |
| download | chromium_src-9d9ac7657928ab1f0dc219f7c4bd857f1986ba9d.zip chromium_src-9d9ac7657928ab1f0dc219f7c4bd857f1986ba9d.tar.gz chromium_src-9d9ac7657928ab1f0dc219f7c4bd857f1986ba9d.tar.bz2 | |
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
Review URL: https://chromiumcodereview.appspot.com/9788001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128328 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/oak')
| -rw-r--r-- | ui/oak/oak_aura_window_display.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/oak/oak_aura_window_display.cc b/ui/oak/oak_aura_window_display.cc index 214a005..fce9406 100644 --- a/ui/oak/oak_aura_window_display.cc +++ b/ui/oak/oak_aura_window_display.cc @@ -32,7 +32,6 @@ ROW_ROOTWINDOW, ROW_TRANSIENTCHILDREN, ROW_TRANSIENTPARENT, ROW_USERDATA, -ROW_STOPSEVENTPROPAGATION, ROW_IGNOREEVENTS, ROW_CANFOCUS, ROW_HITTESTBOUNDSOVERRIDE, @@ -137,9 +136,6 @@ 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()); |