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

Unified Diff: ash/mus/accelerators/accelerator_controller_registrar.h

Issue 2783613003: Add window cycle completion and cancellation accelerators in mus+ash. (Closed)
Patch Set: rename constants. Created 3 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 | « no previous file | ash/mus/accelerators/accelerator_controller_registrar.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/accelerators/accelerator_controller_registrar.h
diff --git a/ash/mus/accelerators/accelerator_controller_registrar.h b/ash/mus/accelerators/accelerator_controller_registrar.h
index 737c607855c6564b6bda6b7b425e01d14c99a078..a311885375ca0ddc5035a35714e56b3a4ac8b196 100644
--- a/ash/mus/accelerators/accelerator_controller_registrar.h
+++ b/ash/mus/accelerators/accelerator_controller_registrar.h
@@ -45,6 +45,10 @@ class AcceleratorControllerRegistrar : public AcceleratorHandler,
private:
friend class AcceleratorControllerRegistrarTestApi;
+ // Accelerators for window cycle.
+ const ui::Accelerator window_cycle_complete_accelerator_;
+ const ui::Accelerator window_cycle_cancel_accelerator_;
+
// ui::AcceleratorManagerDelegate:
void OnAcceleratorsRegistered(
const std::vector<ui::Accelerator>& accelerators) override;
@@ -57,6 +61,12 @@ class AcceleratorControllerRegistrar : public AcceleratorHandler,
const ui::Accelerator& accelerator,
std::vector<ui::mojom::WmAcceleratorPtr>& accelerator_vector);
+ // TODO(moshayedi): crbug.com/629191. Handling window cycle accelerators here
+ // is just a temporary solution and we should remove these once we have a
+ // proper solution.
+ void RegisterWindowCycleAccelerators();
+ bool HandleWindowCycleAccelerator(const ui::Accelerator& accelerator);
+
// The flow of accelerators in ash is:
// . wm::AcceleratorFilter() sees events first as it's a pre-target handler.
// . AcceleratorFilter forwards to its delegate, which indirectly is
« no previous file with comments | « no previous file | ash/mus/accelerators/accelerator_controller_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698