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

Unified Diff: ash/mus/bridge/wm_shell_mus.h

Issue 2235363003: Wires up WmShellMus::Add/RemovePointerWatcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pointer_watcher_capture
Patch Set: merge to tot again Created 4 years, 4 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 ae1b3890bf6b8befe3e05e8409460a21351c18d5..6ebdd804239a2a210c65a8c37693a8168dc81aa1 100644
--- a/ash/mus/bridge/wm_shell_mus.h
+++ b/ash/mus/bridge/wm_shell_mus.h
@@ -23,6 +23,10 @@ namespace ui {
class WindowTreeClient;
}
+namespace views {
+class PointerWatcherEventRouter;
+}
+
namespace ash {
namespace mus {
@@ -37,7 +41,8 @@ class WmWindowMus;
class WmShellMus : public WmShell, public ui::WindowTreeClientObserver {
public:
WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
- WindowManager* window_manager);
+ WindowManager* window_manager,
+ views::PointerWatcherEventRouter* pointer_watcher_event_router);
~WmShellMus() override;
static WmShellMus* Get();
@@ -97,7 +102,8 @@ class WmShellMus : public WmShell, public ui::WindowTreeClientObserver {
void RemoveActivationObserver(WmActivationObserver* observer) override;
void AddDisplayObserver(WmDisplayObserver* observer) override;
void RemoveDisplayObserver(WmDisplayObserver* observer) override;
- void AddPointerWatcher(views::PointerWatcher* watcher) override;
+ void AddPointerWatcher(views::PointerWatcher* watcher,
+ bool wants_moves) override;
void RemovePointerWatcher(views::PointerWatcher* watcher) override;
bool IsTouchDown() override;
#if defined(OS_CHROMEOS)
@@ -119,6 +125,8 @@ class WmShellMus : public WmShell, public ui::WindowTreeClientObserver {
WindowManager* window_manager_;
+ views::PointerWatcherEventRouter* pointer_watcher_event_router_;
+
std::vector<WmRootWindowControllerMus*> root_window_controllers_;
std::unique_ptr<AcceleratorControllerDelegateMus>
« 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