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

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

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/mus/bridge/wm_shell_mus.h ('k') | ash/mus/window_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shell_mus.cc
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
index ca83fad3deedccbc0d6498cdf668527f0f803bdd..03539ea765e16820e80869d9f0da77c48051cd67 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -35,6 +35,7 @@
#include "services/ui/public/cpp/window.h"
#include "services/ui/public/cpp/window_tree_client.h"
#include "ui/display/screen.h"
+#include "ui/views/mus/pointer_watcher_event_router.h"
namespace ash {
namespace mus {
@@ -102,10 +103,13 @@ class SessionStateDelegateStub : public SessionStateDelegate {
} // namespace
-WmShellMus::WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
- WindowManager* window_manager)
+WmShellMus::WmShellMus(
+ std::unique_ptr<ShellDelegate> shell_delegate,
+ WindowManager* window_manager,
+ views::PointerWatcherEventRouter* pointer_watcher_event_router)
: WmShell(std::move(shell_delegate)),
window_manager_(window_manager),
+ pointer_watcher_event_router_(pointer_watcher_event_router),
session_state_delegate_(new SessionStateDelegateStub) {
window_tree_client()->AddObserver(this);
WmShell::Set(this);
@@ -357,13 +361,13 @@ void WmShellMus::RemoveDisplayObserver(WmDisplayObserver* observer) {
NOTIMPLEMENTED();
}
-void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher) {
- // TODO(jamescook): Move PointerWatcherDelegateMus to //ash/mus and use here.
- NOTIMPLEMENTED();
+void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher,
+ bool wants_moves) {
+ pointer_watcher_event_router_->AddPointerWatcher(watcher, wants_moves);
}
void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) {
- NOTIMPLEMENTED();
+ pointer_watcher_event_router_->RemovePointerWatcher(watcher);
}
bool WmShellMus::IsTouchDown() {
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/mus/window_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698