ash/system/chromeos/audio/tray_audio.cc - Issue 115113006: Rename Launcher to Shelf.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/system/chromeos/audio/tray_audio.cc

Issue 115113006: Rename Launcher to Shelf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: more fixes Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ash/system/chromeos/audio/tray_audio.cc

diff --git a/ash/system/chromeos/audio/tray_audio.cc b/ash/system/chromeos/audio/tray_audio.cc

index 7d26fc6b9e93b808b12a821072439cce938866f4..3dbd8154bcb2a6bd1845a7f5c0ca4a04ce1e6026 100644

--- a/ash/system/chromeos/audio/tray_audio.cc

+++ b/ash/system/chromeos/audio/tray_audio.cc

@@ -596,7 +596,7 @@ bool TrayAudio::ShouldHideArrow() const {

return true;

}

-bool TrayAudio::ShouldShowLauncher() const {

+bool TrayAudio::ShouldShowShelf() const {

return ash::switches::ShowAudioDeviceMenu() && !pop_up_volume_view_;

}