diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 21:25:07 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 21:25:07 +0000 |
| commit | fb52d25a47d4200c0a19ac93bc3ddcae7bcbdc8d (patch) | |
| tree | a41593fa00159ff081ca2ff65bbdf40cab2f16e4 /ash/root_window_controller.cc | |
| parent | 5537099c44f42493f4c409bce73bb95d06fc06e0 (diff) | |
| download | chromium_src-fb52d25a47d4200c0a19ac93bc3ddcae7bcbdc8d.zip chromium_src-fb52d25a47d4200c0a19ac93bc3ddcae7bcbdc8d.tar.gz chromium_src-fb52d25a47d4200c0a19ac93bc3ddcae7bcbdc8d.tar.bz2 | |
Revert 160696 - 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.
Review URL: https://chromiumcodereview.appspot.com/11047030
TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/11087014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/root_window_controller.cc')
| -rw-r--r-- | ash/root_window_controller.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc index b0a5b92bb..1f08095 100644 --- a/ash/root_window_controller.cc +++ b/ash/root_window_controller.cc @@ -13,6 +13,7 @@ #include "ash/shell_factory.h" #include "ash/shell_window_ids.h" #include "ash/wm/base_layout_manager.h" +#include "ash/wm/event_client_impl.h" #include "ash/wm/property_util.h" #include "ash/wm/root_window_layout_manager.h" #include "ash/wm/screen_dimmer.h" @@ -143,6 +144,8 @@ namespace internal { RootWindowController::RootWindowController(aura::RootWindow* root_window) : root_window_(root_window) { SetRootWindowController(root_window, this); + + event_client_.reset(new EventClientImpl(root_window)); screen_dimmer_.reset(new ScreenDimmer(root_window)); } @@ -159,6 +162,7 @@ void RootWindowController::Shutdown() { NULL : Shell::GetPrimaryRootWindow()); } SetRootWindowController(root_window_.get(), NULL); + event_client_.reset(); screen_dimmer_.reset(); workspace_controller_.reset(); // Forget with the display ID so that display lookup |