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

Unified Diff: ui/views/mus/window_manager_connection.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 | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | ui/views/mus/window_manager_connection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/window_manager_connection.h
diff --git a/ui/views/mus/window_manager_connection.h b/ui/views/mus/window_manager_connection.h
index 6d05fb2e5ad618e7339f0688cec8d9f91df73e78..867e97b4522a1dcd7fe157b571c1a7c6d6441807 100644
--- a/ui/views/mus/window_manager_connection.h
+++ b/ui/views/mus/window_manager_connection.h
@@ -27,7 +27,7 @@ class Connector;
namespace views {
class ClipboardMus;
class NativeWidget;
-class PointerDownWatcher;
+class PointerWatcher;
class TouchEventWatcher;
class ScreenMus;
namespace internal {
@@ -65,8 +65,8 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
const Widget::InitParams& init_params,
internal::NativeWidgetDelegate* delegate);
- void AddPointerDownWatcher(PointerDownWatcher* watcher);
- void RemovePointerDownWatcher(PointerDownWatcher* watcher);
+ void AddPointerWatcher(PointerWatcher* watcher);
+ void RemovePointerWatcher(PointerWatcher* watcher);
void AddTouchEventWatcher(TouchEventWatcher* watcher);
void RemoveTouchEventWatcher(TouchEventWatcher* watcher);
@@ -80,7 +80,7 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
const shell::Identity& identity);
// Returns true if there is one or more watchers for this client.
- bool HasPointerDownWatcher();
+ bool HasPointerWatcher();
bool HasTouchEventWatcher();
// ui::WindowTreeClientDelegate:
@@ -97,7 +97,7 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
std::unique_ptr<ScreenMus> screen_;
std::unique_ptr<ui::WindowTreeClient> client_;
// Must be empty on destruction.
- base::ObserverList<PointerDownWatcher, true> pointer_down_watchers_;
+ base::ObserverList<PointerWatcher, true> pointer_watchers_;
base::ObserverList<TouchEventWatcher, true> touch_event_watchers_;
DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection);
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | ui/views/mus/window_manager_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698