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

ash/shell.h

 // 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.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 41 matching lines @@
 }
 
 namespace ui {
 class DisplayConfigurator;
 class Layer;
 class UserActivityDetector;
 class UserActivityPowerManagerNotifier;
 }
 namespace views {
 class NonClientFrameView;
-class PointerDownWatcher;
+class PointerWatcher;
 class Widget;
 namespace corewm {
 class TooltipController;
 }
 }
 
 namespace wm {
 class AcceleratorFilter;
 class CompoundEventFilter;
 class ShadowController;
@@ skipping 25 matching lines @@
 class KeyboardUMAEventFilter;
 class LinkHandlerModelFactory;
 class LocaleNotificationController;
 class LockStateController;
 enum class LoginStatus;
 class MagnificationController;
 class MouseCursorEventFilter;
 class NewWindowDelegate;
 class OverlayEventFilter;
 class PartialMagnificationController;
-class PointerDownWatcherDelegate;
+class PointerWatcherDelegate;
 class PowerButtonController;
 class PowerEventObserver;
 class ProjectingObserver;
 class ResizeShadowController;
 class ResolutionNotificationController;
 class RootWindowController;
 class ScopedOverviewAnimationSettingsFactoryAura;
 class ScopedTargetRootWindow;
 class ScreenAsh;
 class ScreenOrientationController;
@@ skipping 148 matching lines @@
   // Creates a virtual keyboard. Deletes the old virtual keyboard if it already
   // exists.
   void CreateKeyboard();
 
   // Deactivates the virtual keyboard.
   void DeactivateKeyboard();
 
   // 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
   // MaximizeModeController is not currently setting a display rotation. Or if
   // the |resolution_notification_controller_| is not showing its confirmation
   // dialog. If true then changes to display settings can be saved.
   bool ShouldSaveDisplaySettings();
 #endif
 
   AcceleratorControllerDelegateAura* accelerator_controller_delegate() {
@@ skipping 263 matching lines @@
   std::unique_ptr<::wm::CompoundEventFilter> env_filter_;
 
   std::vector<WindowAndBoundsPair> to_restore_;
 
   std::unique_ptr<UserMetricsRecorder> user_metrics_recorder_;
   std::unique_ptr<AcceleratorControllerDelegateAura>
       accelerator_controller_delegate_;
   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_;
   std::unique_ptr<WindowPositioner> window_positioner_;
 
   std::unique_ptr<DragDropController> drag_drop_controller_;
   std::unique_ptr<ResizeShadowController> resize_shadow_controller_;
   std::unique_ptr<::wm::ShadowController> shadow_controller_;
   std::unique_ptr<::wm::VisibilityController> visibility_controller_;
   std::unique_ptr<::wm::WindowModalityController> window_modality_controller_;
@@ skipping 93 matching lines @@
   base::SequencedWorkerPool* blocking_pool_;
 
   bool in_mus_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_