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

Unified Diff: mash/wm/root_window_controller.cc

Issue 1814533002: Use ui::Event instead of mojom::EventPtr in mash/wm. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_eventptr
Patch Set: Created 4 years, 9 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 | « mash/wm/root_window_controller.h ('k') | mash/wm/window_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/root_window_controller.cc
diff --git a/mash/wm/root_window_controller.cc b/mash/wm/root_window_controller.cc
index 34ac1a9ec77ab31befb752199ffc61ce3702cd84..ca74674d48c46684746311f0d51673472cbf9d07 100644
--- a/mash/wm/root_window_controller.cc
+++ b/mash/wm/root_window_controller.cc
@@ -82,14 +82,13 @@ mus::WindowManagerClient* RootWindowController::window_manager_client() {
return window_manager_->window_manager_client();
}
-void RootWindowController::OnAccelerator(uint32_t id,
- mus::mojom::EventPtr event) {
+void RootWindowController::OnAccelerator(uint32_t id, const ui::Event& event) {
switch (id) {
case kWindowSwitchAccelerator:
window_manager_client()->ActivateNextWindow();
break;
default:
- app_->OnAccelerator(id, std::move(event));
+ app_->OnAccelerator(id, event);
break;
}
}
« no previous file with comments | « mash/wm/root_window_controller.h ('k') | mash/wm/window_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698