diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 16:21:17 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-23 16:21:17 +0000 |
| commit | e8de9ea15ead4a310e303b86f785433c837e5910 (patch) | |
| tree | 400fd599de7f09887fa28695186e102a570b7ca8 /ash/shell.h | |
| parent | 5ebd74c164778f697a4deea82bc0fd469c6999fd (diff) | |
| download | chromium_src-e8de9ea15ead4a310e303b86f785433c837e5910.zip chromium_src-e8de9ea15ead4a310e303b86f785433c837e5910.tar.gz chromium_src-e8de9ea15ead4a310e303b86f785433c837e5910.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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=128328
Review URL: https://chromiumcodereview.appspot.com/9788001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ash/shell.h b/ash/shell.h index 23a13cd..764587f 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -60,6 +60,7 @@ class ActivationController; class AcceleratorFilter; class AppList; class DragDropController; +class EventClientImpl; class FocusCycler; class InputMethodEventFilter; class MonitorController; @@ -283,6 +284,7 @@ class ASH_EXPORT Shell { scoped_ptr<VideoDetector> video_detector_; scoped_ptr<WindowCycleController> window_cycle_controller_; scoped_ptr<internal::FocusCycler> focus_cycler_; + scoped_ptr<internal::EventClientImpl> event_client_; scoped_ptr<internal::MonitorController> monitor_controller_; // An event filter that pre-handles all key events to send them to an IME. |