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

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

Issue 2586333003: Make mash register initial batch of accelerators in single shot. (Closed)
Patch Set: Add server log when adding accelerator vector. Fix/Refactor codes/comments/format. 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
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 da2841f6979bc5b64bcfcb49f710e495ba346a34..9e57edc90c2d05610d4ee52668be876336854d55 100644
--- a/ash/mus/accelerators/accelerator_controller_registrar.h
+++ b/ash/mus/accelerators/accelerator_controller_registrar.h
@@ -8,6 +8,7 @@
#include <stdint.h>
#include <map>
+#include <vector>
#include "ash/mus/accelerators/accelerator_handler.h"
#include "base/macros.h"
@@ -42,7 +43,15 @@ class AcceleratorControllerRegistrar : public AcceleratorHandler,
void OnAcceleratorRegistered(const ui::Accelerator& accelerator) override;
void OnAcceleratorUnregistered(const ui::Accelerator& accelerator) override;
+ void OnAcceleratorsRegistered(
+ const std::vector<ui::Accelerator>& accelerators) override;
+
private:
+ // Add accelerator with newly generated id to accelerator vector.
mfomitchev 2017/01/03 19:54:35 IMHO "newly generated id" is a bit ambiguous, beca
thanhph1 2017/01/06 21:55:56 Done, thanks! Please review my new comment.
+ void AddAcceleratorToVector(
+ const ui::Accelerator& accelerator,
+ std::vector<ui::mojom::AcceleratorPtr>& accelerator_vector);
+
friend class AcceleratorControllerRegistrarTestApi;
// The flow of accelerators in ash is:
@@ -86,6 +95,8 @@ class AcceleratorControllerRegistrar : public AcceleratorHandler,
std::unique_ptr<AcceleratorRouter> router_;
+ std::vector<ui::mojom::AcceleratorPtr> accelerator_ptrs_;
+
// Set of registered local ids.
std::set<uint16_t> ids_;

Powered by Google App Engine
This is Rietveld 408576698