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

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 25e6ddc3ce3c45ad1997c318a1d82ecff84b218d..6c94e532a4b16ebcbe9d93ab663e0fdbba102c7a 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -59,7 +59,7 @@ class UserActivityPowerManagerNotifier;
 }
 namespace views {
 class NonClientFrameView;
-class PointerDownWatcher;
+class PointerWatcher;
 class Widget;
 namespace corewm {
 class TooltipController;
@@ -105,7 +105,7 @@ class MouseCursorEventFilter;
 class NewWindowDelegate;
 class OverlayEventFilter;
 class PartialMagnificationController;
-class PointerDownWatcherDelegate;
+class PointerWatcherDelegate;
 class PowerButtonController;
 class PowerEventObserver;
 class ProjectingObserver;
@@ -274,8 +274,8 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
   // Show shelf view if it was created hidden (before session has started).
   void ShowShelf();
 
-  void AddPointerDownWatcher(views::PointerDownWatcher* watcher);
-  void RemovePointerDownWatcher(views::PointerDownWatcher* watcher);
+  void AddPointerWatcher(views::PointerWatcher* watcher);
+  void RemovePointerWatcher(views::PointerWatcher* watcher);
 
 #if defined(OS_CHROMEOS)
   // Test if MaximizeModeWindowManager is not enabled, and if
@@ -559,7 +559,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
   std::unique_ptr<UserWallpaperDelegate> user_wallpaper_delegate_;
   std::unique_ptr<SessionStateDelegate> session_state_delegate_;
   std::unique_ptr<NewWindowDelegate> new_window_delegate_;
-  std::unique_ptr<PointerDownWatcherDelegate> pointer_down_watcher_delegate_;
+  std::unique_ptr<PointerWatcherDelegate> pointer_watcher_delegate_;
   std::unique_ptr<ShelfDelegate> shelf_delegate_;
   std::unique_ptr<ShelfItemDelegateManager> shelf_item_delegate_manager_;
   std::unique_ptr<ShelfWindowWatcher> shelf_window_watcher_;