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

Unified Diff: ash/common/accelerators/accelerator_controller.cc

Issue 2187703003: Wires up registering accelerators from mash with the wm (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
Index: ash/common/accelerators/accelerator_controller.cc
diff --git a/ash/common/accelerators/accelerator_controller.cc b/ash/common/accelerators/accelerator_controller.cc
index 37ab7983e63e40c3318b6e149d91bbd696889522..b8be032df449ec8cef9ed43bcad19218c0c2f37f 100644
--- a/ash/common/accelerators/accelerator_controller.cc
+++ b/ash/common/accelerators/accelerator_controller.cc
@@ -328,9 +328,10 @@ void HandleVolumeUp(const ui::Accelerator& accelerator) {
// AcceleratorController, public:
AcceleratorController::AcceleratorController(
- AcceleratorControllerDelegate* delegate)
+ AcceleratorControllerDelegate* delegate,
+ ui::AcceleratorManagerDelegate* manager_delegate)
: delegate_(delegate),
- accelerator_manager_(new ui::AcceleratorManager),
+ accelerator_manager_(new ui::AcceleratorManager(manager_delegate)),
accelerator_history_(new ui::AcceleratorHistory) {
Init();
}
« no previous file with comments | « ash/common/accelerators/accelerator_controller.h ('k') | ash/common/accelerators/ash_focus_manager_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698