diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 18:38:32 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 18:38:32 +0000 |
| commit | ef6e6e2d263975b652ceb5c42a657e588fa00255 (patch) | |
| tree | a95bb177aefb6911088d5856fbf5d88199950668 /ash/system/audio | |
| parent | c3352a9c049fa3933080fb7c5fb0937fcb82b8bd (diff) | |
| download | chromium_src-ef6e6e2d263975b652ceb5c42a657e588fa00255.zip chromium_src-ef6e6e2d263975b652ceb5c42a657e588fa00255.tar.gz chromium_src-ef6e6e2d263975b652ceb5c42a657e588fa00255.tar.bz2 | |
ash uber tray: Show just the volume/brightness item when user presses appropriate keys.
This CL implements SystemTrayItem::PopupDetailedView. This will be used for network details etc. too.
BUG=110130,110131
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9539002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124213 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/audio')
| -rw-r--r-- | ash/system/audio/tray_volume.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ash/system/audio/tray_volume.cc b/ash/system/audio/tray_volume.cc index dbc5b41..be57c89 100644 --- a/ash/system/audio/tray_volume.cc +++ b/ash/system/audio/tray_volume.cc @@ -110,8 +110,8 @@ views::View* TrayVolume::CreateDefaultView() { } views::View* TrayVolume::CreateDetailedView() { - NOTIMPLEMENTED(); - return NULL; + volume_view_.reset(new tray::VolumeView); + return volume_view_.get(); } void TrayVolume::DestroyTrayView() { @@ -123,6 +123,7 @@ void TrayVolume::DestroyDefaultView() { } void TrayVolume::DestroyDetailedView() { + volume_view_.reset(); } void TrayVolume::OnVolumeChanged(float percent) { |