Index: ash/launcher/launcher.cc |
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc |
index f8314bc3cac2767d2c5ed1d3dc7b1319c1fff1ea..bc879e7cb8f01664641280f40ccfecf6145c5fe9 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_); |