diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-11 00:12:39 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-11 00:12:39 +0000 |
| commit | 7b0f750bf7b0ccd2f0962817bab1460342d113e9 (patch) | |
| tree | 89809ac408028af8ecff717caf7673e33bdd0dc7 /ash/launcher | |
| parent | 7208e05ab641d7dbc83bfc2bf202d2ece0445a74 (diff) | |
| download | chromium_src-7b0f750bf7b0ccd2f0962817bab1460342d113e9.zip chromium_src-7b0f750bf7b0ccd2f0962817bab1460342d113e9.tar.gz chromium_src-7b0f750bf7b0ccd2f0962817bab1460342d113e9.tar.bz2 | |
Change GetContainer to take a root window
Update the use of GetContainer to use the correct root window.
BUG=123160
TEST=no functional change. all tests must pass.
Review URL: https://chromiumcodereview.appspot.com/10540076
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher')
| -rw-r--r-- | ash/launcher/launcher.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc index aa0024b..f8314bc 100644 --- a/ash/launcher/launcher.cc +++ b/ash/launcher/launcher.cc @@ -116,7 +116,8 @@ Launcher::Launcher(aura::Window* window_container) params.layer_type = ui::LAYER_SOLID_COLOR; params.transparent = true; params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; - params.parent = Shell::GetInstance()->GetContainer( + params.parent = Shell::GetContainer( + window_container_->GetRootWindow(), ash::internal::kShellWindowId_LauncherContainer); launcher_view_ = new internal::LauncherView(model_.get(), delegate_.get()); launcher_view_->Init(); |