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

ash/pointer_watcher_delegate_aura.cc

Index: ash/pointer_watcher_delegate_aura.cc
diff --git a/ash/pointer_down_watcher_delegate_aura.cc b/ash/pointer_watcher_delegate_aura.cc
similarity index 59%
rename from ash/pointer_down_watcher_delegate_aura.cc
rename to ash/pointer_watcher_delegate_aura.cc
index 58c23d8a723bf0497be1179e727cdef28c0fd965..d70720d5a1932395559a707fb2e3defc33ac896f 100644
--- a/ash/pointer_down_watcher_delegate_aura.cc
+++ b/ash/pointer_watcher_delegate_aura.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ash/pointer_down_watcher_delegate_aura.h"
+#include "ash/pointer_watcher_delegate_aura.h"
 
 #include "ash/shell.h"
 #include "ui/aura/client/screen_position_client.h"
@@ -10,44 +10,44 @@
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/geometry/point.h"
-#include "ui/views/pointer_down_watcher.h"
+#include "ui/views/pointer_watcher.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
-PointerDownWatcherDelegateAura::PointerDownWatcherDelegateAura() {
+PointerWatcherDelegateAura::PointerWatcherDelegateAura() {
   Shell::GetInstance()->AddPreTargetHandler(this);
 }
 
-PointerDownWatcherDelegateAura::~PointerDownWatcherDelegateAura() {
+PointerWatcherDelegateAura::~PointerWatcherDelegateAura() {
   Shell::GetInstance()->RemovePreTargetHandler(this);
 }
 
-void PointerDownWatcherDelegateAura::AddPointerDownWatcher(
-    views::PointerDownWatcher* watcher) {
-  pointer_down_watchers_.AddObserver(watcher);
+void PointerWatcherDelegateAura::AddPointerWatcher(
+    views::PointerWatcher* watcher) {
+  pointer_watchers_.AddObserver(watcher);
 }
 
-void PointerDownWatcherDelegateAura::RemovePointerDownWatcher(
-    views::PointerDownWatcher* watcher) {
-  pointer_down_watchers_.RemoveObserver(watcher);
+void PointerWatcherDelegateAura::RemovePointerWatcher(
+    views::PointerWatcher* watcher) {
+  pointer_watchers_.RemoveObserver(watcher);
 }
 
-void PointerDownWatcherDelegateAura::OnMouseEvent(ui::MouseEvent* event) {
+void PointerWatcherDelegateAura::OnMouseEvent(ui::MouseEvent* event) {
   if (event->type() == ui::ET_MOUSE_PRESSED)
-    FOR_EACH_OBSERVER(views::PointerDownWatcher, pointer_down_watchers_,
+    FOR_EACH_OBSERVER(views::PointerWatcher, pointer_watchers_,
                       OnMousePressed(*event, GetLocationInScreen(*event),
                                      GetTargetWidget(*event)));
 }
 
-void PointerDownWatcherDelegateAura::OnTouchEvent(ui::TouchEvent* event) {
+void PointerWatcherDelegateAura::OnTouchEvent(ui::TouchEvent* event) {
   if (event->type() == ui::ET_TOUCH_PRESSED)
-    FOR_EACH_OBSERVER(views::PointerDownWatcher, pointer_down_watchers_,
+    FOR_EACH_OBSERVER(views::PointerWatcher, pointer_watchers_,
                       OnTouchPressed(*event, GetLocationInScreen(*event),
                                      GetTargetWidget(*event)));
 }
 
-gfx::Point PointerDownWatcherDelegateAura::GetLocationInScreen(
+gfx::Point PointerWatcherDelegateAura::GetLocationInScreen(
     const ui::LocatedEvent& event) const {
   aura::Window* target = static_cast<aura::Window*>(event.target());
   gfx::Point location_in_screen = event.location();
@@ -56,7 +56,7 @@ gfx::Point PointerDownWatcherDelegateAura::GetLocationInScreen(
   return location_in_screen;
 }
 
-views::Widget* PointerDownWatcherDelegateAura::GetTargetWidget(
+views::Widget* PointerWatcherDelegateAura::GetTargetWidget(
     const ui::LocatedEvent& event) const {
   aura::Window* window = static_cast<aura::Window*>(event.target());
   return views::Widget::GetTopLevelWidgetForNativeView(window);