diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 22:06:38 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-31 22:06:38 +0000 |
| commit | b8003573f5d97dc582ce6e28d33fb8df8002b994 (patch) | |
| tree | 0790106ae656fa3307165a3b95382656e61b954d /ui/aura/desktop | |
| parent | 05ca1d9dddd080f946b400654d4916ab27eea830 (diff) | |
| download | chromium_src-b8003573f5d97dc582ce6e28d33fb8df8002b994.zip chromium_src-b8003573f5d97dc582ce6e28d33fb8df8002b994.tar.gz chromium_src-b8003573f5d97dc582ce6e28d33fb8df8002b994.tar.bz2 | |
Create a focus manager per desktop RootWindow.
BUG=none
TEST=linux_aura bot cycles green
R=oshima
TBR=beng
Review URL: https://chromiumcodereview.appspot.com/10447127
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139887 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/desktop')
| -rw-r--r-- | ui/aura/desktop/desktop_stacking_client.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/aura/desktop/desktop_stacking_client.cc b/ui/aura/desktop/desktop_stacking_client.cc index 4ee0090..a06c261 100644 --- a/ui/aura/desktop/desktop_stacking_client.cc +++ b/ui/aura/desktop/desktop_stacking_client.cc @@ -4,6 +4,7 @@ #include "ui/aura/desktop/desktop_stacking_client.h" +#include "ui/aura/focus_manager.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" @@ -21,6 +22,7 @@ Window* DesktopStackingClient::GetDefaultParent(Window* window) { if (!null_parent_.get()) { null_parent_.reset(new aura::RootWindow(gfx::Rect(100, 100))); null_parent_->Init(); + null_parent_->set_focus_manager(new FocusManager); } return null_parent_.get(); } |