summaryrefslogtreecommitdiffstats
path: root/ash/system/audio
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-12 09:54:29 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-12 09:54:29 +0000
commit945f9cae941c94f4043595454aced2cb31cbeda8 (patch)
tree2edec774917a7b8820c5e711babcda020bf2d1a8 /ash/system/audio
parenteb10ce48efc10df2f0eeb5e26b14bf3120ea90fc (diff)
downloadchromium_src-945f9cae941c94f4043595454aced2cb31cbeda8.zip
chromium_src-945f9cae941c94f4043595454aced2cb31cbeda8.tar.gz
chromium_src-945f9cae941c94f4043595454aced2cb31cbeda8.tar.bz2
[Cleanup] rename tray_delegate -> system_tray_delegate
BUG=none TEST=none Review URL: https://chromiumcodereview.appspot.com/11476034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172566 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/audio')
-rw-r--r--ash/system/audio/tray_volume.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/system/audio/tray_volume.cc b/ash/system/audio/tray_volume.cc
index 672ddeb..fd865d7 100644
--- a/ash/system/audio/tray_volume.cc
+++ b/ash/system/audio/tray_volume.cc
@@ -44,12 +44,12 @@ const int kVolumeImageHeight = 25;
const int kVolumeLevels = 4;
bool IsAudioMuted() {
- return Shell::GetInstance()->tray_delegate()->
+ return Shell::GetInstance()->system_tray_delegate()->
GetVolumeControlDelegate()->IsAudioMuted();
}
float GetVolumeLevel() {
- return Shell::GetInstance()->tray_delegate()->
+ return Shell::GetInstance()->system_tray_delegate()->
GetVolumeControlDelegate()->GetVolumeLevel();
}
@@ -189,7 +189,7 @@ class VolumeView : public views::View,
virtual void ButtonPressed(views::Button* sender,
const ui::Event& event) OVERRIDE {
CHECK(sender == icon_ || sender == mute_);
- ash::Shell::GetInstance()->tray_delegate()->
+ ash::Shell::GetInstance()->system_tray_delegate()->
GetVolumeControlDelegate()->SetAudioMuted(!IsAudioMuted());
}
@@ -199,7 +199,7 @@ class VolumeView : public views::View,
float old_value,
views::SliderChangeReason reason) OVERRIDE {
if (reason == views::VALUE_CHANGED_BY_USER) {
- ash::Shell::GetInstance()->tray_delegate()->
+ ash::Shell::GetInstance()->system_tray_delegate()->
GetVolumeControlDelegate()->SetVolumeLevel(value);
}
icon_->Update();