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

Unified Diff: ash/common/system/tray/default_system_tray_delegate.cc

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/system/tray/default_system_tray_delegate.cc
diff --git a/ash/common/system/tray/default_system_tray_delegate.cc b/ash/common/system/tray/default_system_tray_delegate.cc
index 102832b441a6859d3b1f1900e9919e56dd5272de..f58c2141d32010c7b2ff868b3197a748d29cba2e 100644
--- a/ash/common/system/tray/default_system_tray_delegate.cc
+++ b/ash/common/system/tray/default_system_tray_delegate.cc
@@ -8,7 +8,6 @@
#include <utility>
#include "ash/common/system/networking_config_delegate.h"
-#include "ash/common/system/volume_control_delegate.h"
#include "base/message_loop/message_loop.h"
#include "base/time/time.h"
@@ -64,16 +63,6 @@ bool DefaultSystemTrayDelegate::GetBluetoothDiscovering() {
return false;
}
-VolumeControlDelegate* DefaultSystemTrayDelegate::GetVolumeControlDelegate()
- const {
- return volume_control_delegate_.get();
-}
-
-void DefaultSystemTrayDelegate::SetVolumeControlDelegate(
- std::unique_ptr<VolumeControlDelegate> delegate) {
- volume_control_delegate_ = std::move(delegate);
-}
-
int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() {
// This is the default width for English languages.
return 300;
« no previous file with comments | « ash/common/system/tray/default_system_tray_delegate.h ('k') | ash/common/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698