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

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

Issue 2203003003: Get AcceleratorControllerTest working with mash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 4 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 bb509bd878b2808c5ebf9d437867bde7de4c3c64..da2841f6979bc5b64bcfcb49f710e495ba346a34 100644
--- a/ash/mus/accelerators/accelerator_controller_registrar.h
+++ b/ash/mus/accelerators/accelerator_controller_registrar.h
@@ -21,6 +21,7 @@ class AcceleratorRouter;
namespace mus {
+class AcceleratorControllerRegistrarTestApi;
class WindowManager;
// Responsible for registering accelerators created by AcceleratorController
@@ -42,6 +43,8 @@ class AcceleratorControllerRegistrar : public AcceleratorHandler,
void OnAcceleratorUnregistered(const ui::Accelerator& accelerator) override;
private:
+ friend class AcceleratorControllerRegistrarTestApi;
+
// The flow of accelerators in ash is:
// . wm::AcceleratorFilter() sees events first as it's a pre-target handler.
// . AcceleratorFilter forwards to its delegate, which indirectly is

Powered by Google App Engine
This is Rietveld 408576698