Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2444)

Unified Diff: ash/common/wm_shell.h

Issue 2167643005: Revert of mus: Rename .*PointerWatcher.* to .*PointerDownWatcher.*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resolve conflicts Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/system/tray/tray_event_filter.cc ('k') | ash/mus/bridge/wm_shell_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm_shell.h
diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h
index 28016113b8e0b20a84a0dce6476de25fe38dc3a7..ec0b0941dc926b8a8b0381185bf70e0ff94f24de 100644
--- a/ash/common/wm_shell.h
+++ b/ash/common/wm_shell.h
@@ -17,7 +17,7 @@
#include "base/observer_list.h"
namespace views {
-class PointerDownWatcher;
+class PointerWatcher;
}
namespace ash {
@@ -250,8 +250,8 @@ class ASH_EXPORT WmShell {
void AddShellObserver(ShellObserver* observer);
void RemoveShellObserver(ShellObserver* observer);
- virtual void AddPointerDownWatcher(views::PointerDownWatcher* watcher) = 0;
- virtual void RemovePointerDownWatcher(views::PointerDownWatcher* watcher) = 0;
+ virtual void AddPointerWatcher(views::PointerWatcher* watcher) = 0;
+ virtual void RemovePointerWatcher(views::PointerWatcher* watcher) = 0;
// TODO: Move these back to LockStateController when that has been moved.
void OnLockStateEvent(LockStateObserver::EventType event);
« no previous file with comments | « ash/common/system/tray/tray_event_filter.cc ('k') | ash/mus/bridge/wm_shell_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698