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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/mus/bridge/wm_shell_mus.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/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 d9e9bd2b9f0e427b0be43de396fede0f96d1a467..a07baf09d976d1a613e9ec4420add7280f15cf90 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -37,7 +37,7 @@
#include "ui/aura/window.h"
#include "ui/display/manager/managed_display_info.h"
#include "ui/display/screen.h"
-#include "ui/views/mus/pointer_watcher_event_router2.h"
+#include "ui/views/mus/pointer_watcher_event_router.h"
#include "ui/wm/core/capture_controller.h"
#include "ui/wm/core/focus_controller.h"
@@ -112,7 +112,7 @@ class SessionStateDelegateStub : public SessionStateDelegate {
WmShellMus::WmShellMus(
std::unique_ptr<ShellDelegate> shell_delegate,
WindowManager* window_manager,
- views::PointerWatcherEventRouter2* pointer_watcher_event_router)
+ views::PointerWatcherEventRouter* pointer_watcher_event_router)
: WmShell(std::move(shell_delegate)),
window_manager_(window_manager),
pointer_watcher_event_router_(pointer_watcher_event_router),
« 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