| Index: ash/launcher/launcher_view.cc
|
| diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
|
| index 65955d21f2afa9cc60e099c27580df83567e701c..94c4a822512eeea9585cec1c4a1c5b87e4794bf4 100644
|
| --- a/ash/launcher/launcher_view.cc
|
| +++ b/ash/launcher/launcher_view.cc
|
| @@ -261,7 +261,9 @@ class LauncherView::StartFadeAnimationDelegate
|
| DISALLOW_COPY_AND_ASSIGN(StartFadeAnimationDelegate);
|
| };
|
|
|
| -LauncherView::LauncherView(LauncherModel* model, LauncherDelegate* delegate)
|
| +LauncherView::LauncherView(LauncherModel* model,
|
| + LauncherDelegate* delegate,
|
| + ShelfLayoutManager* shelf_layout_manager)
|
| : model_(model),
|
| delegate_(delegate),
|
| view_model_(new views::ViewModel),
|
| @@ -278,7 +280,7 @@ LauncherView::LauncherView(LauncherModel* model, LauncherDelegate* delegate)
|
| bounds_animator_->AddObserver(this);
|
| set_context_menu_controller(this);
|
| focus_search_.reset(new LauncherFocusSearch(view_model_.get()));
|
| - tooltip_.reset(new LauncherTooltipManager(alignment_));
|
| + tooltip_.reset(new LauncherTooltipManager(alignment_, shelf_layout_manager));
|
| }
|
|
|
| LauncherView::~LauncherView() {
|
|
|