diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 22:39:12 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 22:39:12 +0000 |
| commit | 3f33f46e7212c2a4a5d63af2fa33a1d80ae6bb17 (patch) | |
| tree | 79f9ea7ca02027f81fb9def23138b846aba16ea8 /ui/aura_shell | |
| parent | e4bae193c61a924c76e1ac7d104a23650e9be3c7 (diff) | |
| download | chromium_src-3f33f46e7212c2a4a5d63af2fa33a1d80ae6bb17.zip chromium_src-3f33f46e7212c2a4a5d63af2fa33a1d80ae6bb17.tar.gz chromium_src-3f33f46e7212c2a4a5d63af2fa33a1d80ae6bb17.tar.bz2 | |
Respect consumes_events_ when attempting to set focus.
BUG=none
TEST=unit
Review URL: http://codereview.chromium.org/8137014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104194 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell')
| -rw-r--r-- | ui/aura_shell/desktop_window.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/aura_shell/desktop_window.cc b/ui/aura_shell/desktop_window.cc index b0dc814..373f647 100644 --- a/ui/aura_shell/desktop_window.cc +++ b/ui/aura_shell/desktop_window.cc @@ -37,7 +37,7 @@ void CreateSpecialContainers(aura::Window::Windows* containers) { containers->push_back(launcher_container); aura::Window* lock_container = new aura::Window(NULL); - lock_container->set_consumes_events(true); + lock_container->set_stops_event_propagation(true); lock_container->set_id(internal::kShellWindowId_LockScreenContainer); containers->push_back(lock_container); @@ -52,8 +52,8 @@ void InitDesktopWindow() { aura::Window::Windows::const_iterator i; for (i = containers.begin(); i != containers.end(); ++i) { (*i)->Init(); - (*i)->Show(); aura::Desktop::GetInstance()->window()->AddChild(*i); + (*i)->Show(); } aura::Window* root_window = aura::Desktop::GetInstance()->window(); |