diff options
| author | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-10 23:45:38 +0000 |
|---|---|---|
| committer | pkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-10 23:45:38 +0000 |
| commit | 32b1640238c621ac9153711c644446b48afe410f (patch) | |
| tree | 10807ea5b3e1a48d800da9c7cdcfe1dd18973f49 /ash/accelerators/accelerator_dispatcher.cc | |
| parent | c2c48576a935e992a34df1669df5a49d5a3fd23c (diff) | |
| download | chromium_src-32b1640238c621ac9153711c644446b48afe410f.zip chromium_src-32b1640238c621ac9153711c644446b48afe410f.tar.gz chromium_src-32b1640238c621ac9153711c644446b48afe410f.tar.bz2 | |
Fixes login screen menus.
Pass in an instance of a window to use for testing whether the inner dispatcher can receive events.
The |associated_window| should be such that it is behind a window which stops event propagation whenever the inner dispatcher should not receive events.
This fixes menus on the login screen because menus are above the lock screen in z order.
Bug=113247
Testing=Manual
Review URL: http://codereview.chromium.org/9374028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121570 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_dispatcher.cc')
| -rw-r--r-- | ash/accelerators/accelerator_dispatcher.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ash/accelerators/accelerator_dispatcher.cc b/ash/accelerators/accelerator_dispatcher.cc index 46d7bec..c72fdc2 100644 --- a/ash/accelerators/accelerator_dispatcher.cc +++ b/ash/accelerators/accelerator_dispatcher.cc @@ -7,9 +7,11 @@ namespace ash { AcceleratorDispatcher::AcceleratorDispatcher( - MessageLoop::Dispatcher* nested_dispatcher) - : nested_dispatcher_(nested_dispatcher) { + MessageLoop::Dispatcher* nested_dispatcher, aura::Window* associated_window) + : nested_dispatcher_(nested_dispatcher), + associated_window_(associated_window) { DCHECK(nested_dispatcher_); + DCHECK(associated_window_); } } // namespace ash |