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

Unified Diff: chrome/browser/ui/ash/volume_controller_chromeos.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: chrome/browser/ui/ash/volume_controller_chromeos.h
diff --git a/chrome/browser/ui/ash/volume_controller_chromeos.h b/chrome/browser/ui/ash/volume_controller_chromeos.h
index ea7c689a9a3ce5964db3eaae33543c403e4736ff..532b3bafc0d73b90c5cf78706e3496dbde746f6d 100644
--- a/chrome/browser/ui/ash/volume_controller_chromeos.h
+++ b/chrome/browser/ui/ash/volume_controller_chromeos.h
@@ -5,32 +5,26 @@
#ifndef CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_CHROMEOS_H_
#define CHROME_BROWSER_UI_ASH_VOLUME_CONTROLLER_CHROMEOS_H_
-#include <stdint.h>
-
-#include "ash/common/system/volume_control_delegate.h"
-#include "base/compiler_specific.h"
+#include "ash/public/interfaces/volume.mojom.h"
#include "base/macros.h"
-#include "chromeos/audio/cras_audio_handler.h"
-#include "ui/base/accelerators/accelerator.h"
+#include "mojo/public/cpp/bindings/binding_set.h"
-// A class which controls volume when F8-10 or a multimedia key for volume is
-// pressed.
-class VolumeController : public ash::VolumeControlDelegate,
- public chromeos::CrasAudioHandler::AudioObserver {
+// Controls the volume when F8-10 or a multimedia key for volume is pressed.
+class VolumeController : public ash::mojom::VolumeController {
public:
VolumeController();
~VolumeController() override;
- // Overridden from ash::VolumeControlDelegate:
- void HandleVolumeMute(const ui::Accelerator& accelerator) override;
- void HandleVolumeDown(const ui::Accelerator& accelerator) override;
- void HandleVolumeUp(const ui::Accelerator& accelerator) override;
+ // Binds the mojom::VolumeController interface request to this object.
+ void BindRequest(ash::mojom::VolumeControllerRequest request);
- // Overridden from chromeos::CrasAudioHandler::AudioObserver.
- void OnOutputNodeVolumeChanged(uint64_t node_id, int volume) override;
- void OnOutputMuteChanged(bool mute_on, bool system_adjust) override;
+ // Overridden from ash::mojom::VolumeController:
+ void VolumeMute() override;
+ void VolumeDown() override;
+ void VolumeUp() override;
private:
+ mojo::BindingSet<ash::mojom::VolumeController> bindings_;
DISALLOW_COPY_AND_ASSIGN(VolumeController);
};
« no previous file with comments | « chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc ('k') | chrome/browser/ui/ash/volume_controller_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698