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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2586333003: Make mash register initial batch of accelerators in single shot. (Closed)
Patch Set: Change register to use accelerator vector. Created 4 years 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_controller_unittest.cc ('k') | ash/common/accelerators/accelerator_controller.cc » ('j') | ash/mus/accelerators/accelerator_controller_registrar.h » ('J')
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 38b9007edbebd90702c6fd39435788865b64e1ff..13e257c37866bae63a58c6b94aaf78fe12ced1c2 100644
--- a/ash/common/accelerators/accelerator_controller.h
+++ b/ash/common/accelerators/accelerator_controller.h
@@ -10,6 +10,7 @@
#include <map>
#include <memory>
#include <set>
+#include <vector>
#include "ash/ash_export.h"
#include "ash/common/accelerators/accelerator_table.h"
@@ -63,7 +64,8 @@ class ASH_EXPORT AcceleratorController
// Registers a global keyboard accelerator for the specified target. If
// multiple targets are registered for an accelerator, a target registered
// later has higher priority.
- void Register(const ui::Accelerator& accelerator,
+
mfomitchev 2016/12/22 01:04:50 Remove space, update comment.
thanhph 2016/12/22 20:36:01 Done.
+ void Register(const std::vector<ui::Accelerator>& accelerators,
ui::AcceleratorTarget* target);
// Unregisters the specified keyboard accelerator for the specified target.
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/common/accelerators/accelerator_controller.cc » ('j') | ash/mus/accelerators/accelerator_controller_registrar.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698