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

chrome/browser/ui/ash/chrome_shell_delegate.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 "chrome/browser/ui/ash/chrome_shell_delegate.h"
 
 #include <stddef.h>
 
 #include "ash/accelerators/magnifier_key_scroller.h"
 #include "ash/accelerators/spoken_feedback_toggler.h"
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/accessibility_types.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/content/gpu_support_impl.h"
-#include "ash/pointer_down_watcher_delegate_aura.h"
+#include "ash/pointer_watcher_delegate_aura.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
@@ skipping 391 matching lines @@
 ash::ShelfDelegate* ChromeShellDelegate::CreateShelfDelegate(
     ash::ShelfModel* model) {
   if (!shelf_delegate_) {
     shelf_delegate_ =
         ChromeLauncherControllerImpl::CreateInstance(nullptr, model);
     shelf_delegate_->Init();
   }
   return shelf_delegate_;
 }
 
-std::unique_ptr<ash::PointerDownWatcherDelegate>
-ChromeShellDelegate::CreatePointerDownWatcherDelegate() {
-  return base::WrapUnique(new ash::PointerDownWatcherDelegateAura);
+std::unique_ptr<ash::PointerWatcherDelegate>
+ChromeShellDelegate::CreatePointerWatcherDelegate() {
+  return base::WrapUnique(new ash::PointerWatcherDelegateAura);
 }
 
 ui::MenuModel* ChromeShellDelegate::CreateContextMenu(
     ash::WmShelf* wm_shelf,
     const ash::ShelfItem* item) {
   DCHECK(shelf_delegate_);
   // Don't show context menu for exclusive app runtime mode.
   if (chrome::IsRunningInAppMode())
     return nullptr;
 
@@ skipping 98 matching lines @@
       NOTREACHED() << "Unexpected notification " << type;
   }
 }
 
 void ChromeShellDelegate::PlatformInit() {
   registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_PROFILE_PREPARED,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
                  content::NotificationService::AllSources());
 }