summaryrefslogtreecommitdiffstats
path: root/ash/launcher/launcher.cc
diff options
context:
space:
mode:
Diffstat (limited to 'ash/launcher/launcher.cc')
-rw-r--r--ash/launcher/launcher.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc
index f8314bc..bc879e7 100644
--- a/ash/launcher/launcher.cc
+++ b/ash/launcher/launcher.cc
@@ -95,7 +95,8 @@ void Launcher::DelegateView::Layout() {
// Launcher --------------------------------------------------------------------
-Launcher::Launcher(aura::Window* window_container)
+Launcher::Launcher(aura::Window* window_container,
+ internal::ShelfLayoutManager* shelf_layout_manager)
: widget_(NULL),
window_container_(window_container),
delegate_view_(NULL),
@@ -119,7 +120,8 @@ Launcher::Launcher(aura::Window* window_container)
params.parent = Shell::GetContainer(
window_container_->GetRootWindow(),
ash::internal::kShellWindowId_LauncherContainer);
- launcher_view_ = new internal::LauncherView(model_.get(), delegate_.get());
+ launcher_view_ = new internal::LauncherView(
+ model_.get(), delegate_.get(), shelf_layout_manager);
launcher_view_->Init();
delegate_view_ = new DelegateView(this);
delegate_view_->AddChildView(launcher_view_);