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

Unified Diff: ui/views/mus/mus_client.cc

Issue 2521823002: Wires up PointerWatcherEventRouter for views aura-mus (Closed)
Patch Set: cleanup Created 4 years, 1 month 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
Index: ui/views/mus/mus_client.cc
diff --git a/ui/views/mus/mus_client.cc b/ui/views/mus/mus_client.cc
index 3b2b4139c7a83ff926505701bbba8712cc0dd4df..4b98a098240162b5b40cf7876f6b92cd2bc7e883 100644
--- a/ui/views/mus/mus_client.cc
+++ b/ui/views/mus/mus_client.cc
@@ -21,6 +21,7 @@
#include "ui/views/mus/aura_init.h"
#include "ui/views/mus/clipboard_mus.h"
#include "ui/views/mus/desktop_window_tree_host_mus.h"
+#include "ui/views/mus/pointer_watcher_event_router2.h"
#include "ui/views/mus/screen_mus.h"
#include "ui/views/views_delegate.h"
#include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
@@ -99,7 +100,8 @@ MusClient::MusClient(service_manager::Connector* connector,
aura::Env::GetInstance()->SetWindowTreeClient(window_tree_client_.get());
window_tree_client_->ConnectViaWindowTreeFactory(connector_);
- // TODO: wire up PointerWatcherEventRouter. http://crbug.com/663526.
+ pointer_watcher_event_router_ =
+ base::MakeUnique<PointerWatcherEventRouter2>(window_tree_client_.get());
screen_ = base::MakeUnique<ScreenMus>(this);
screen_->Init(connector);
@@ -129,8 +131,7 @@ void MusClient::OnEmbedRootDestroyed(aura::Window* root) {
void MusClient::OnPointerEventObserved(const ui::PointerEvent& event,
aura::Window* target) {
- // TODO: wire up PointerWatcherEventRouter. http://crbug.com/663526.
- NOTIMPLEMENTED();
+ pointer_watcher_event_router_->OnPointerEventObserved(event, target);
}
void MusClient::OnWindowManagerFrameValuesChanged() {

Powered by Google App Engine
This is Rietveld 408576698