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

Unified Diff: ash/mus/bridge/wm_shell_mus.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/wm_shell.h ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shell_mus.h
diff --git a/ash/mus/bridge/wm_shell_mus.h b/ash/mus/bridge/wm_shell_mus.h
index 938a1d5cefcbadc4f0585ac1c73351aef8a76cd1..6a9f1b59c33e21c1902c9a65a23fdc4c29712ffa 100644
--- a/ash/mus/bridge/wm_shell_mus.h
+++ b/ash/mus/bridge/wm_shell_mus.h
@@ -82,8 +82,8 @@ class WmShellMus : public WmShell, public ::ui::WindowTreeClientObserver {
void RemoveActivationObserver(WmActivationObserver* observer) override;
void AddDisplayObserver(WmDisplayObserver* observer) override;
void RemoveDisplayObserver(WmDisplayObserver* observer) override;
- void AddPointerDownWatcher(views::PointerDownWatcher* watcher) override;
- void RemovePointerDownWatcher(views::PointerDownWatcher* watcher) override;
+ void AddPointerWatcher(views::PointerWatcher* watcher) override;
+ void RemovePointerWatcher(views::PointerWatcher* watcher) override;
#if defined(OS_CHROMEOS)
void ToggleIgnoreExternalKeyboard() override;
#endif
« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698