Close mash shelf tooltips on touches outside the shelf.

ash/shelf/shelf_tooltip_manager.cc

 // Copyright 2013 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 "ash/shelf/shelf_tooltip_manager.h"
 
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
 #include "base/bind.h"
+#include "base/strings/string16.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/views/bubble/bubble_dialog_delegate.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
@@ skipping 70 matching lines @@
 ShelfTooltipManager::ShelfTooltipManager(ShelfView* shelf_view)
     : timer_delay_(kTooltipAppearanceDelay),
       shelf_view_(shelf_view),
       root_window_(nullptr),
       shelf_layout_manager_(nullptr),
       bubble_(nullptr),
       weak_factory_(this) {}
 
 ShelfTooltipManager::~ShelfTooltipManager() {
   WillDeleteShelf();
+
+  Shell::GetInstance()->RemovePointerWatcher(this);
+
   if (root_window_) {
     root_window_->RemoveObserver(this);
     root_window_->RemovePreTargetHandler(this);
     root_window_ = nullptr;
   }
 }
 
 void ShelfTooltipManager::Init() {
   shelf_layout_manager_ = shelf_view_->shelf()->shelf_layout_manager();
   shelf_layout_manager_->AddObserver(this);
 
-  // TODO(msw): Observe events outside the shelf in mash, to close tooltips.
   root_window_ = shelf_view_->GetWidget()->GetNativeWindow()->GetRootWindow();
   root_window_->AddPreTargetHandler(this);
   root_window_->AddObserver(this);
+
+  Shell::GetInstance()->AddPointerWatcher(this);
 }
 
 void ShelfTooltipManager::Close() {
   timer_.Stop();
   if (bubble_)
     bubble_->GetWidget()->Close();
   bubble_ = nullptr;
 }
 
 bool ShelfTooltipManager::IsVisible() const {
@@ skipping 32 matching lines @@
 }
 
 void ShelfTooltipManager::ShowTooltipWithDelay(views::View* view) {
   if (!shelf_layout_manager_ || shelf_layout_manager_->IsVisible()) {
     timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(timer_delay_),
                  base::Bind(&ShelfTooltipManager::ShowTooltip,
                             weak_factory_.GetWeakPtr(), view));
   }
 }
 
+void ShelfTooltipManager::OnMousePressed(const ui::MouseEvent& event,
+                                         const gfx::Point& location_in_screen) {
+  // PointerWatcher supports tracking events outside the root window in mash.

[James Cook, 2016/05/04 19:17:49]

nit: I might say something explicitly that any click/touch, even one inside the
tooltip, is supposed to close it.

[msw, 2016/05/04 20:07:49]

Done.

+  Close();
+}
+
+void ShelfTooltipManager::OnTouchPressed(const ui::TouchEvent& event,
+                                         const gfx::Point& location_in_screen) {
+  // PointerWatcher supports tracking events outside the root window in mash.
+  Close();
+}
+
 void ShelfTooltipManager::OnEvent(ui::Event* event) {
   if (event->type() == ui::ET_MOUSE_PRESSED ||

[James Cook, 2016/05/04 19:17:49]

Eliminate this one, as it's confusing that there are two mouse pressed handlers.
The PointerWatcher will give you press events that hit the tooltip.

[msw, 2016/05/04 20:07:49]

Done. (Added early return for touch/mouse pressed)

       event->type() == ui::ET_MOUSE_EXITED || !event->IsMouseEvent() ||
       event->target() != shelf_view_->GetWidget()->GetNativeWindow()) {
     if (!event->IsKeyEvent())
       Close();
     return;
   }
 
   gfx::Point point = static_cast<ui::LocatedEvent*>(event)->location();
   aura::Window::ConvertPointToTarget(
       static_cast<aura::Window*>(event->target()),
@@ skipping 38 matching lines @@
     // AutoHide state change happens during an event filter, so immediate close
     // may cause a crash in the HandleMouseEvent() after the filter.  So we just
     // schedule the Close here.
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&ShelfTooltipManager::Close, weak_factory_.GetWeakPtr()));
   }
 }
 
 }  // namespace ash