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

Side by Side Diff: ash/system/audio/tray_volume.cc

Issue 10837062: Display the volume control detailed when user press mute button. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Show volume control UI when mute button is pressed. Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/system/audio/tray_volume.h" 5 #include "ash/system/audio/tray_volume.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/system/tray/system_tray_delegate.h" 10 #include "ash/system/tray/system_tray_delegate.h"
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
256 } 256 }
257 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false); 257 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);
258 } 258 }
259 259
260 void TrayVolume::OnMuteToggled() { 260 void TrayVolume::OnMuteToggled() {
261 if (tray_view()) 261 if (tray_view())
262 tray_view()->SetVisible(GetInitialVisibility()); 262 tray_view()->SetVisible(GetInitialVisibility());
263 263
264 if (volume_view_) 264 if (volume_view_)
265 volume_view_->Update(); 265 volume_view_->Update();
266 else
267 PopupDetailedView(kTrayPopupAutoCloseDelayInSeconds, false);
266 } 268 }
267 269
268 } // namespace internal 270 } // namespace internal
269 } // namespace ash 271 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698