Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3539)

Unified Diff: ash/launcher/launcher_view.cc

Issue 10808102: Add EventFilter for LauncherTooltip (2nd try). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« ash/launcher/launcher_tooltip_manager.cc ('K') | « ash/launcher/launcher_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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]);
« ash/launcher/launcher_tooltip_manager.cc ('K') | « ash/launcher/launcher_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698