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

Unified Diff: ash/mus/window_manager.h

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/accelerators/accelerator_delegate.cc ('k') | ash/mus/window_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager.h
diff --git a/ash/mus/window_manager.h b/ash/mus/window_manager.h
index 1ab50466089212065f1d7b66b624024f302270c4..ab8d6ed3dee5f557a1ddae50c7e91d51536d9e87 100644
--- a/ash/mus/window_manager.h
+++ b/ash/mus/window_manager.h
@@ -100,12 +100,13 @@ class WindowManager : public ::ui::WindowManagerDelegate,
bool not_responding) override;
void OnWmNewDisplay(::ui::Window* window,
const display::Display& display) override;
- void OnAccelerator(uint32_t id, const ui::Event& event) override;
void OnWmPerformMoveLoop(::ui::Window* window,
::ui::mojom::MoveLoopSource source,
const gfx::Point& cursor_location,
const base::Callback<void(bool)>& on_done) override;
void OnWmCancelMoveLoop(::ui::Window* window) override;
+ ui::mojom::EventResult OnAccelerator(uint32_t id,
+ const ui::Event& event) override;
shell::Connector* connector_;
« no previous file with comments | « ash/accelerators/accelerator_delegate.cc ('k') | ash/mus/window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698