summaryrefslogtreecommitdiffstats
path: root/ash/wm/event_client_impl.h
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-09 07:04:18 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-09 07:04:18 +0000
commitbb0c80765c0d4285b2a80bf54d5ed2e6d2f1570a (patch)
tree7f8b1377720bcd62c20efca757edc0343b2e8b37 /ash/wm/event_client_impl.h
parent2ca5b5a1c132b34ee8ae90f708e5dee933a03180 (diff)
downloadchromium_src-bb0c80765c0d4285b2a80bf54d5ed2e6d2f1570a.zip
chromium_src-bb0c80765c0d4285b2a80bf54d5ed2e6d2f1570a.tar.gz
chromium_src-bb0c80765c0d4285b2a80bf54d5ed2e6d2f1570a.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 Review URL: https://codereview.chromium.org/11047030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/event_client_impl.h')
-rw-r--r--ash/wm/event_client_impl.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/ash/wm/event_client_impl.h b/ash/wm/event_client_impl.h
index cf689ed..3702709 100644
--- a/ash/wm/event_client_impl.h
+++ b/ash/wm/event_client_impl.h
@@ -17,7 +17,7 @@ namespace internal {
class EventClientImpl : public aura::client::EventClient {
public:
- explicit EventClientImpl(aura::RootWindow* root_window);
+ EventClientImpl();
virtual ~EventClientImpl();
private:
@@ -25,8 +25,6 @@ class EventClientImpl : public aura::client::EventClient {
virtual bool CanProcessEventsWithinSubtree(
const aura::Window* window) const OVERRIDE;
- aura::RootWindow* root_window_;
-
DISALLOW_COPY_AND_ASSIGN(EventClientImpl);
};