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 /ash/shell.h | |
| 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 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/ash/shell.h b/ash/shell.h index 764587f..23a13cd 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -60,7 +60,6 @@ class ActivationController; class AcceleratorFilter; class AppList; class DragDropController; -class EventClientImpl; class FocusCycler; class InputMethodEventFilter; class MonitorController; @@ -284,7 +283,6 @@ 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. |