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

Unified Diff: ash/common/system/tray/default_system_tray_delegate.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
« no previous file with comments | « ash/common/system/audio/tray_audio.cc ('k') | ash/common/system/tray/default_system_tray_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/default_system_tray_delegate.h
diff --git a/ash/common/system/tray/default_system_tray_delegate.h b/ash/common/system/tray/default_system_tray_delegate.h
index 5536c352b6df3902b727401c86e711ede85bb98e..a4550ff71d125fa6d9bad42885ed140f0165d356 100644
--- a/ash/common/system/tray/default_system_tray_delegate.h
+++ b/ash/common/system/tray/default_system_tray_delegate.h
@@ -5,8 +5,6 @@
#ifndef ASH_COMMON_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_
#define ASH_COMMON_SYSTEM_TRAY_DEFAULT_SYSTEM_TRAY_DELEGATE_H_
-#include <memory>
-
#include "ash/ash_export.h"
#include "ash/common/system/tray/system_tray_delegate.h"
#include "base/macros.h"
@@ -29,14 +27,10 @@ class ASH_EXPORT DefaultSystemTrayDelegate : public SystemTrayDelegate {
bool GetBluetoothAvailable() override;
bool GetBluetoothEnabled() override;
bool GetBluetoothDiscovering() override;
- VolumeControlDelegate* GetVolumeControlDelegate() const override;
- void SetVolumeControlDelegate(
- std::unique_ptr<VolumeControlDelegate> delegate) override;
int GetSystemTrayMenuWidth() override;
private:
bool bluetooth_enabled_;
- std::unique_ptr<VolumeControlDelegate> volume_control_delegate_;
DISALLOW_COPY_AND_ASSIGN(DefaultSystemTrayDelegate);
};
« no previous file with comments | « ash/common/system/audio/tray_audio.cc ('k') | ash/common/system/tray/default_system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698