diff options
| author | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 13:33:48 +0000 |
|---|---|---|
| committer | finnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-09 13:33:48 +0000 |
| commit | 100d6acd6dfb17728581bd0f88b0f65c881beab2 (patch) | |
| tree | e571441c33879e57793d8e8daaecd3170fa57fbb /ash/shell.h | |
| parent | 899b34796c9766dcd7d3c03eb9152982a7cb64a4 (diff) | |
| download | chromium_src-100d6acd6dfb17728581bd0f88b0f65c881beab2.zip chromium_src-100d6acd6dfb17728581bd0f88b0f65c881beab2.tar.gz chromium_src-100d6acd6dfb17728581bd0f88b0f65c881beab2.tar.bz2 | |
Revert 160804 - as it caused a ash unit test failure on Windows.
Reverting: Decouple EventClientImpl and root window. Check containers on the same root window as focused window when testing if the focused window can receive events. This was causing lock screen to lose focus when mouse is clicked on another root window.
This Cl also adds a debug build/linux desktop only shortcut (F11) to lock/shutdown.
BUG=152982
TEST=covered by test.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=160696
Review URL: https://codereview.chromium.org/11047030
TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/11093021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160832 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ash/shell.h b/ash/shell.h index 044ba06..ef869bf 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -83,7 +83,6 @@ class ActivationController; class AppListController; class CaptureController; class DragDropController; -class EventClientImpl; class EventRewriterEventFilter; class FocusCycler; class MagnificationController; @@ -176,8 +175,6 @@ class ASH_EXPORT Shell : CursorDelegate, static aura::Window* GetContainer(aura::RootWindow* root_window, int container_id); - static const aura::Window* GetContainer(const aura::RootWindow* root_window, - int container_id); // Returns the list of containers that match |container_id| in // all root windows. @@ -460,7 +457,6 @@ class ASH_EXPORT Shell : CursorDelegate, scoped_ptr<internal::MouseCursorEventFilter> mouse_cursor_filter_; scoped_ptr<internal::ScreenPositionController> screen_position_controller_; scoped_ptr<internal::SystemModalContainerEventFilter> modality_filter_; - scoped_ptr<internal::EventClientImpl> event_client_; // An event filter that rewrites or drops an event. scoped_ptr<internal::EventRewriterEventFilter> event_rewriter_filter_; |