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

Unified Diff: ash/mus/window_manager.cc

Issue 2125883003: Adds ability for pre-target accelerators to not consume events (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 5 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') | services/ui/demo/mus_demo.h » ('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 b14cae6c75e068c3472064dbf243ed63b3bcd67e..715d740ff71f043bf4bd9dcb54c15cbc44a31dcf 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc
@@ -230,18 +230,6 @@ void WindowManager::OnWmNewDisplay(::ui::Window* window,
CreateRootWindowController(window, display);
}
-void WindowManager::OnAccelerator(uint32_t id, const ui::Event& event) {
- switch (id) {
- case kWindowSwitchAccelerator:
- window_manager_client()->ActivateNextWindow();
- break;
- default:
- FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
- OnAccelerator(id, event));
- break;
- }
-}
-
void WindowManager::OnWmPerformMoveLoop(
::ui::Window* window,
::ui::mojom::MoveLoopSource source,
@@ -254,5 +242,19 @@ void WindowManager::OnWmCancelMoveLoop(::ui::Window* window) {
NOTIMPLEMENTED();
}
+ui::mojom::EventResult WindowManager::OnAccelerator(uint32_t id,
+ const ui::Event& event) {
+ switch (id) {
+ case kWindowSwitchAccelerator:
+ window_manager_client()->ActivateNextWindow();
+ break;
+ default:
+ FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
+ OnAccelerator(id, event));
+ break;
+ }
+ return ui::mojom::EventResult::HANDLED;
+}
+
} // namespace mus
} // namespace ash
« no previous file with comments | « ash/mus/window_manager.h ('k') | services/ui/demo/mus_demo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698