| Index: ash/launcher/launcher_view.cc
|
| diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
|
| index 20a513b042e2946c8d74c03e5f32d65c1f24c679..21b173b4d9c719669dcb2dca06c41847b5af5eee 100644
|
| --- a/ash/launcher/launcher_view.cc
|
| +++ b/ash/launcher/launcher_view.cc
|
| @@ -283,7 +283,8 @@ LauncherView::LauncherView(LauncherModel* model,
|
| bounds_animator_->AddObserver(this);
|
| set_context_menu_controller(this);
|
| focus_search_.reset(new LauncherFocusSearch(view_model_.get()));
|
| - tooltip_.reset(new LauncherTooltipManager(alignment_, shelf_layout_manager));
|
| + tooltip_.reset(new LauncherTooltipManager(
|
| + alignment_, shelf_layout_manager, this));
|
| }
|
|
|
| LauncherView::~LauncherView() {
|
| @@ -814,20 +815,6 @@ views::FocusTraversable* LauncherView::GetPaneFocusTraversable() {
|
| return this;
|
| }
|
|
|
| -void LauncherView::OnMouseMoved(const views::MouseEvent& event) {
|
| - if (ShouldHideTooltip(event.location()) && tooltip_->IsVisible())
|
| - tooltip_->Close();
|
| -}
|
| -
|
| -void LauncherView::OnMouseExited(const views::MouseEvent& event) {
|
| - // Mouse exit events are fired for entering to a launcher button from
|
| - // the launcher view, so it checks the location by ShouldHideTooltip().
|
| - gfx::Point point = event.location();
|
| - views::View::ConvertPointToView(parent(), this, &point);
|
| - if (ShouldHideTooltip(point) && tooltip_->IsVisible())
|
| - tooltip_->Close();
|
| -}
|
| -
|
| void LauncherView::LauncherItemAdded(int model_index) {
|
| model_index = CancelDrag(model_index);
|
| views::View* view = CreateViewForItem(model_->items()[model_index]);
|
|
|