Revert of mus: Rename .*PointerWatcher.* to .*PointerDownWatcher.*.

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/common/shell_window_ids.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_view.h"
@@ skipping 85 matching lines @@
     : timer_delay_(kTooltipAppearanceDelay),
       shelf_view_(shelf_view),
       root_window_(nullptr),
       shelf_layout_manager_(nullptr),
       bubble_(nullptr),
       weak_factory_(this) {}
 
 ShelfTooltipManager::~ShelfTooltipManager() {
   WillDeleteShelfLayoutManager();
 
-  Shell::GetInstance()->RemovePointerDownWatcher(this);
+  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);
 
   root_window_ = shelf_view_->GetWidget()->GetNativeWindow()->GetRootWindow();
   root_window_->AddPreTargetHandler(this);
   root_window_->AddObserver(this);
 
-  Shell::GetInstance()->AddPointerDownWatcher(this);
+  Shell::GetInstance()->AddPointerWatcher(this);
 }
 
 void ShelfTooltipManager::Close() {
   timer_.Stop();
   if (bubble_)
     bubble_->GetWidget()->Close();
   bubble_ = nullptr;
 }
 
 bool ShelfTooltipManager::IsVisible() const {
@@ skipping 47 matching lines @@
 }
 
 void ShelfTooltipManager::OnTouchPressed(const ui::TouchEvent& event,
                                          const gfx::Point& location_in_screen,
                                          views::Widget* target) {
   // Close on any touch press events inside or outside the tooltip.
   Close();
 }
 
 void ShelfTooltipManager::OnEvent(ui::Event* event) {
-  // Mouse and touch press events are handled via views::PointerDownWatcher.
+  // Mouse and touch press events are handled via views::PointerWatcher.
   if (event->type() == ui::ET_MOUSE_PRESSED ||
       event->type() == ui::ET_TOUCH_PRESSED) {
     return;
   }
 
   if (event->type() == ui::ET_MOUSE_EXITED || !event->IsMouseEvent() ||
       event->target() != shelf_view_->GetWidget()->GetNativeWindow()) {
     if (!event->IsKeyEvent())
       Close();
     return;
@@ skipping 48 matching lines @@
         base::Bind(&ShelfTooltipManager::Close, weak_factory_.GetWeakPtr()));
   }
 }
 
 bool ShelfTooltipManager::ShouldShowTooltipForView(views::View* view) {
   return shelf_view_ && shelf_view_->ShouldShowTooltipForView(view) &&
          shelf_layout_manager_ && shelf_layout_manager_->IsVisible();
 }
 
 }  // namespace ash