Removed (spurious, touch-initiated) tooltips from nav buttons

ui/views/corewm/tooltip_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/corewm/tooltip_controller.h"
 
 #include <stddef.h>
 
 #include <utility>
 #include <vector>
@@ skipping 163 matching lines @@
   // On key press, we want to hide the tooltip and not show it until change.
   // This is the same behavior as hiding tooltips on timeout. Hence, we can
   // simply simulate a timeout.
   if (tooltip_shown_timer_.IsRunning()) {
     tooltip_shown_timer_.Stop();
     TooltipShownTimerFired();
   }
 }
 
 void TooltipController::OnMouseEvent(ui::MouseEvent* event) {
+  // Ignore mouse events that coincide with the last touch event.
+  if (event->location() == last_touch_loc_) {
+    SetTooltipWindow(NULL);

[sadrul, 2017/04/19 18:31:16]

nullptr

[girard, 2017/04/19 21:39:40]

Acknowledged.

+
+    if (tooltip_->IsVisible() ||
+        (tooltip_window_ &&

[sadrul, 2017/04/19 18:31:16]

Because you are calling SetTooltipWindow(nullptr) above, |tooltip_window_| will
always be null here, right? So this check should be removed.

[girard, 2017/04/19 21:39:40]

Acknowledged.

+         tooltip_text_ != aura::client::GetTooltipText(tooltip_window_)))
+      UpdateIfRequired();
+    return;
+  }
   switch (event->type()) {
     case ui::ET_MOUSE_CAPTURE_CHANGED:
     case ui::ET_MOUSE_EXITED:
     case ui::ET_MOUSE_MOVED:
     case ui::ET_MOUSE_DRAGGED: {
       curr_mouse_loc_ = event->location();
       aura::Window* target = NULL;
       // Avoid a call to display::Screen::GetWindowAtScreenPoint() since it can
       // be very expensive on X11 in cases when the tooltip is hidden anyway.
       if (tooltips_enabled_ &&
@@ skipping 23 matching lines @@
       // Hide the tooltip for click, release, drag, wheel events.
       if (tooltip_->IsVisible())
         tooltip_->Hide();
       break;
     default:
       break;
   }
 }
 
 void TooltipController::OnTouchEvent(ui::TouchEvent* event) {
-  // TODO(varunjain): need to properly implement tooltips for
-  // touch events.
   // Hide the tooltip for touch events.
   tooltip_->Hide();
   SetTooltipWindow(NULL);
+  last_touch_loc_ = event->location();
 }
 
 void TooltipController::OnCancelMode(ui::CancelModeEvent* event) {
   tooltip_->Hide();
   SetTooltipWindow(NULL);
 }
 
 void TooltipController::OnCursorVisibilityChanged(bool is_visible) {
   UpdateIfRequired();
 }
@@ skipping 138 matching lines @@
     return;
   if (tooltip_window_)
     tooltip_window_->RemoveObserver(this);
   tooltip_window_ = target;
   if (tooltip_window_)
     tooltip_window_->AddObserver(this);
 }
 
 }  // namespace corewm
 }  // namespace views