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

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

Issue 2427913003: Use mojo volume interfaces for mash and classic ash. (Closed)
Patch Set: Split volume and system events observers; only hook up volume. Created 4 years, 2 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/common/accelerators/accelerator_controller.h
diff --git a/ash/common/accelerators/accelerator_controller.h b/ash/common/accelerators/accelerator_controller.h
index 6c9741f1ad32d01b7e930c7ec6f89ab78c8e7e32..7a5ae515da4a2323719d2ed466c1f35fd8e394a8 100644
--- a/ash/common/accelerators/accelerator_controller.h
+++ b/ash/common/accelerators/accelerator_controller.h
@@ -14,6 +14,7 @@
#include "ash/ash_export.h"
#include "ash/common/accelerators/accelerator_table.h"
#include "ash/common/accelerators/exit_warning_handler.h"
+#include "ash/public/interfaces/volume.mojom.h"
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
@@ -155,6 +156,10 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
AcceleratorProcessingRestriction GetAcceleratorProcessingRestriction(
int action);
+ // Returns the volume controller interface raw pointer, may be null in tests.
+ mojom::VolumeController* GetVolumeController();
+ void OnVolumeControllerConnectionError();
+
AcceleratorControllerDelegate* delegate_;
std::unique_ptr<ui::AcceleratorManager> accelerator_manager_;
@@ -176,6 +181,9 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
actions_with_deprecations_;
std::set<ui::Accelerator> deprecated_accelerators_;
+ // The cached volume controller interface pointer.
+ mojom::VolumeControllerPtr volume_controller_;
+
// Actions allowed when the user is not signed in.
std::set<int> actions_allowed_at_login_screen_;
// Actions allowed when the screen is locked.
« no previous file with comments | « ash/accelerators/accelerator_interactive_uitest_chromeos.cc ('k') | ash/common/accelerators/accelerator_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698