diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-10 18:05:45 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-10 18:05:45 +0000 |
| commit | 87cc0849f5f0e8c4227f848d7a16f65b8674bd16 (patch) | |
| tree | 6af8ffe4e5b8bd3efc73c79e966917584d5b6708 /ui/aura_shell/desktop_window.cc | |
| parent | f74a757b6512c70b53faf44e4b3b5b887d41f7c0 (diff) | |
| download | chromium_src-87cc0849f5f0e8c4227f848d7a16f65b8674bd16.zip chromium_src-87cc0849f5f0e8c4227f848d7a16f65b8674bd16.tar.gz chromium_src-87cc0849f5f0e8c4227f848d7a16f65b8674bd16.tar.bz2 | |
touchui + aura: Move the keyboard in the front-most container.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8216002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell/desktop_window.cc')
| -rw-r--r-- | ui/aura_shell/desktop_window.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/aura_shell/desktop_window.cc b/ui/aura_shell/desktop_window.cc index 616ba28..5a5113b 100644 --- a/ui/aura_shell/desktop_window.cc +++ b/ui/aura_shell/desktop_window.cc @@ -6,6 +6,7 @@ #include "ui/aura/toplevel_window_container.h" #include "ui/aura/window.h" #include "ui/aura_shell/desktop_layout_manager.h" +#include "ui/aura_shell/shell.h" #include "ui/aura_shell/shell_factory.h" #include "ui/aura_shell/shell_window_ids.h" #include "views/widget/widget.h" @@ -59,19 +60,18 @@ void InitDesktopWindow() { new internal::DesktopLayoutManager(root_window); root_window->SetLayoutManager(desktop_layout); + Shell* shell = Shell::GetInstance(); views::Widget* desktop_background = internal::CreateDesktopBackground(); - aura::Desktop::GetInstance()->window()->GetChildById( + shell->GetContainer( internal::kShellWindowId_DesktopBackgroundContainer)->AddChild( desktop_background->GetNativeView()); views::Widget* launcher = internal::CreateLauncher(); - aura::Desktop::GetInstance()->window()->GetChildById( - internal::kShellWindowId_LauncherContainer)->AddChild( + shell->GetContainer(internal::kShellWindowId_LauncherContainer)->AddChild( launcher->GetNativeView()); views::Widget* status_area = internal::CreateStatusArea(); - aura::Desktop::GetInstance()->window()->GetChildById( - internal::kShellWindowId_StatusContainer)->AddChild( + shell->GetContainer(internal::kShellWindowId_StatusContainer)->AddChild( status_area->GetNativeView()); desktop_layout->set_background_widget(desktop_background); |