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

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

Issue 2586333003: Make mash register initial batch of accelerators in single shot. (Closed)
Patch Set: Change comment/ Modify log sections/ Refactor code. Created 3 years, 11 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/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..9c61acc5ddf848a06186aa2d0308989aa1b03e9c 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"
@@ -38,11 +39,21 @@ class AcceleratorControllerRegistrar : public AcceleratorHandler,
ui::mojom::EventResult OnAccelerator(uint32_t id,
const ui::Event& event) override;
+ private:
// ui::AcceleratorManagerDelegate:
void OnAcceleratorRegistered(const ui::Accelerator& accelerator) override;
void OnAcceleratorUnregistered(const ui::Accelerator& accelerator) override;
- private:
+ void OnAcceleratorsRegistered(
mfomitchev 2017/01/24 17:40:01 Sadrul mentioned that it would be better to call t
thanhph1 2017/01/24 20:26:16 Done, thanks!
+ const std::vector<ui::Accelerator>& accelerators) override;
+
+ // Generate id and add the corresponding accelerator to accelerator vector.
+ // Creates a PRE_TARGET and POST_TARGET mojom accelerators for the provided
+ // |accelerator| and adds them to the provided |accelerator_vector|.
+ 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 +97,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