diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 05:52:38 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-10 05:52:38 +0000 |
| commit | e67291f1b7e1816dc04ed63f15217587f535578b (patch) | |
| tree | 678cbc7682de374ffa35727967041a7ccd1911f2 /ash/root_window_controller.h | |
| parent | 60d96bbf45b43fdeae5037e01794a17eedda89d0 (diff) | |
| download | chromium_src-e67291f1b7e1816dc04ed63f15217587f535578b.zip chromium_src-e67291f1b7e1816dc04ed63f15217587f535578b.tar.gz chromium_src-e67291f1b7e1816dc04ed63f15217587f535578b.tar.bz2 | |
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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=160804
Review URL: https://chromiumcodereview.appspot.com/11047030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161058 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.h')
| -rw-r--r-- | ash/root_window_controller.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/ash/root_window_controller.h b/ash/root_window_controller.h index e8f623d..c88795d 100644 --- a/ash/root_window_controller.h +++ b/ash/root_window_controller.h @@ -25,7 +25,6 @@ namespace ash { class ToplevelWindowEventHandler; namespace internal { -class EventClientImpl; class RootWindowLayoutManager; class ScreenDimmer; class SystemBackgroundController; @@ -101,8 +100,6 @@ class ASH_EXPORT RootWindowController { // desktop background image when displaying the login screen. scoped_ptr<SystemBackgroundController> background_; - // An event filter that pre-handles all key events to send them to an IME. - scoped_ptr<EventClientImpl> event_client_; scoped_ptr<ScreenDimmer> screen_dimmer_; scoped_ptr<WorkspaceController> workspace_controller_; |