summaryrefslogtreecommitdiffstats
path: root/ash/system/audio
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-03 15:19:56 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-03 15:19:56 +0000
commiteac76c6fe105026cb080334f2de97a6ba27f09fe (patch)
tree4f55db45ecef7a34e0c14b7c6ab9c390dc66430e /ash/system/audio
parent1b5bcd397cf7e5bfb947be72f06138a2ee4be699 (diff)
downloadchromium_src-eac76c6fe105026cb080334f2de97a6ba27f09fe.zip
chromium_src-eac76c6fe105026cb080334f2de97a6ba27f09fe.tar.gz
chromium_src-eac76c6fe105026cb080334f2de97a6ba27f09fe.tar.bz2
ash uber tray: Allow customizing each item depending on whether the user is logged in or not.
If a user is not logged in (e.g. in the login screen, or during an incognito session), some of the items need to behave differently. So provide this information to each of the items so that such customization is possible. Also, make sure all the items get a chance to update themselves when user logs in. BUG=110130 TEST=tested on device, logged in as normal user, and incognito. Review URL: https://chromiumcodereview.appspot.com/9580024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124863 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/audio')
-rw-r--r--ash/system/audio/tray_volume.cc6
-rw-r--r--ash/system/audio/tray_volume.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/ash/system/audio/tray_volume.cc b/ash/system/audio/tray_volume.cc
index 0bfa5bc..bbf37f2 100644
--- a/ash/system/audio/tray_volume.cc
+++ b/ash/system/audio/tray_volume.cc
@@ -148,16 +148,16 @@ TrayVolume::TrayVolume() {
TrayVolume::~TrayVolume() {
}
-views::View* TrayVolume::CreateTrayView() {
+views::View* TrayVolume::CreateTrayView(user::LoginStatus status) {
return NULL;
}
-views::View* TrayVolume::CreateDefaultView() {
+views::View* TrayVolume::CreateDefaultView(user::LoginStatus status) {
volume_view_.reset(new tray::VolumeView);
return volume_view_.get();
}
-views::View* TrayVolume::CreateDetailedView() {
+views::View* TrayVolume::CreateDetailedView(user::LoginStatus status) {
volume_view_.reset(new tray::VolumeView);
return volume_view_.get();
}
diff --git a/ash/system/audio/tray_volume.h b/ash/system/audio/tray_volume.h
index 45b91ec..48168ec 100644
--- a/ash/system/audio/tray_volume.h
+++ b/ash/system/audio/tray_volume.h
@@ -25,9 +25,9 @@ class TrayVolume : public SystemTrayItem,
private:
// Overridden from SystemTrayItem.
- virtual views::View* CreateTrayView() OVERRIDE;
- virtual views::View* CreateDefaultView() OVERRIDE;
- virtual views::View* CreateDetailedView() OVERRIDE;
+ virtual views::View* CreateTrayView(user::LoginStatus status) OVERRIDE;
+ virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE;
+ virtual views::View* CreateDetailedView(user::LoginStatus status) OVERRIDE;
virtual void DestroyTrayView() OVERRIDE;
virtual void DestroyDefaultView() OVERRIDE;
virtual void DestroyDetailedView() OVERRIDE;