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

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

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
« no previous file with comments | « ash/ash.gyp ('k') | ash/common/accelerators/accelerator_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/accelerators/accelerator_controller.h
diff --git a/ash/common/accelerators/accelerator_controller.h b/ash/common/accelerators/accelerator_controller.h
index d0557dad23979584322699c3e31d149bc049f24f..6c9741f1ad32d01b7e930c7ec6f89ab78c8e7e32 100644
--- a/ash/common/accelerators/accelerator_controller.h
+++ b/ash/common/accelerators/accelerator_controller.h
@@ -22,6 +22,7 @@
namespace ui {
class AcceleratorManager;
+class AcceleratorManagerDelegate;
}
namespace ash {
@@ -36,7 +37,8 @@ class ImeControlDelegate;
// also implements several handlers as an accelerator target.
class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
public:
- explicit AcceleratorController(AcceleratorControllerDelegate* delegate);
+ AcceleratorController(AcceleratorControllerDelegate* delegate,
+ ui::AcceleratorManagerDelegate* manager_delegate);
~AcceleratorController() override;
// A list of possible ways in which an accelerator should be restricted before
« no previous file with comments | « ash/ash.gyp ('k') | ash/common/accelerators/accelerator_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698