diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 03:15:40 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-13 03:15:40 +0000 |
| commit | 1128681f3f257f6726b58ba35dba2c6e720115ac (patch) | |
| tree | 3c274eef89a739d0911641761f20361043bb176d /ui/aura/root_window.h | |
| parent | 7bca40f56e2a04482e1ccb5d89f90c9335dd4329 (diff) | |
| download | chromium_src-1128681f3f257f6726b58ba35dba2c6e720115ac.zip chromium_src-1128681f3f257f6726b58ba35dba2c6e720115ac.tar.gz chromium_src-1128681f3f257f6726b58ba35dba2c6e720115ac.tar.bz2 | |
* Don't activate a window if screen is locked.
* StopEventsPropagation should check window visibility.
* Changed IsScreenLocked to use the same logic as
CanFocus.
BUG=none
TEST=new test case is added to window_unittests.cc
Review URL: http://codereview.chromium.org/9181012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/root_window.h')
| -rw-r--r-- | ui/aura/root_window.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h index 89eaa17..d38a535 100644 --- a/ui/aura/root_window.h +++ b/ui/aura/root_window.h @@ -159,6 +159,7 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate, // Overridden from Window: virtual bool CanFocus() const OVERRIDE; + virtual bool CanReceiveEvents() const OVERRIDE; virtual internal::FocusManager* GetFocusManager() OVERRIDE; virtual RootWindow* GetRootWindow() OVERRIDE; virtual void WindowDetachedFromRootWindow(Window* window) OVERRIDE; |