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

Unified Diff: ash/mus/window_manager.cc

Issue 2610063002: Cleanup after removing views-mus code (Closed)
Patch Set: merge Created 3 years, 11 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/window_manager.h ('k') | ash/touch_hud/mus/touch_hud_application.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager.cc
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc
index 5e1c8c9dcf2d0f61cd5b25501725f34461b007f5..6ff5d61d15ec9ea83087e652207a8c83fdc13948 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc
@@ -49,7 +49,7 @@
#include "ui/base/hit_test.h"
#include "ui/display/display_observer.h"
#include "ui/events/mojo/event.mojom.h"
-#include "ui/views/mus/pointer_watcher_event_router2.h"
+#include "ui/views/mus/pointer_watcher_event_router.h"
#include "ui/views/mus/screen_mus.h"
#include "ui/wm/core/capture_controller.h"
#include "ui/wm/core/focus_controller.h"
@@ -118,7 +118,7 @@ void WindowManager::Init(
display::Screen::SetScreenInstance(screen_.get());
pointer_watcher_event_router_ =
- base::MakeUnique<views::PointerWatcherEventRouter2>(
+ base::MakeUnique<views::PointerWatcherEventRouter>(
window_tree_client_.get());
shadow_controller_ = base::MakeUnique<ShadowController>();
« no previous file with comments | « ash/mus/window_manager.h ('k') | ash/touch_hud/mus/touch_hud_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698