ash/system/tray/system_tray.cc - Issue 188693004: Revert of Enable the volume slider in Ash for windows.

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/tray/system_tray.cc

Issue 188693004: Revert of Enable the volume slider in Ash for windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 9 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:

Index: ash/system/tray/system_tray.cc

diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc

index 344fe587ac1b80c064710b109691d2d81170a244..59f69707885d7e509a3cb5dc91e5f9b665557c36 100644

--- a/ash/system/tray/system_tray.cc

+++ b/ash/system/tray/system_tray.cc

@@ -62,9 +62,6 @@

#include "ash/system/chromeos/tray_display.h"

#include "ash/system/chromeos/tray_tracing.h"

#include "ui/message_center/message_center.h"

-#elif defined(OS_WIN)

-#include "ash/system/win/audio/tray_audio_win.h"

-#include "media/audio/win/core_audio_util_win.h"

#endif

using views::TrayBubbleView;

@@ -207,8 +204,6 @@

AddTrayItem(tray_date_);

#elif defined(OS_WIN)

AddTrayItem(tray_accessibility_);

- if (media::CoreAudioUtil::IsSupported())

- AddTrayItem(new internal::TrayAudioWin(this));

AddTrayItem(new internal::TrayUpdate(this));

AddTrayItem(tray_date_);

#elif defined(OS_LINUX)

« no previous file with comments | « ash/system/audio/tray_audio_delegate.h ('k') | ash/system/win/OWNERS » ('j') | no next file with comments »