ash/system/tray/system_tray.cc - Issue 2075813002: Remove ash_shell audio system tray item on 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 2075813002: Remove ash_shell audio system tray item on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync and rebase. Created 4 years, 6 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 side-by-side diff with in-line comments

Download patch

Index: ash/system/tray/system_tray.cc

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

index 073ae4aa3d37ff2a62bacc2e9d0a4422c1026c76..eec513cdac80fe9420c6ca6f1ab03dba335b831f 100644

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

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

@@ -67,9 +67,6 @@

#include "ash/system/ime/tray_ime_chromeos.h"

#include "ash/system/tray/media_security/multi_profile_media_tray_item.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;

@@ -213,8 +210,6 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {

AddTrayItem(tray_date_);

#elif defined(OS_WIN)

AddTrayItem(tray_accessibility_);

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

- AddTrayItem(new TrayAudioWin(this));

AddTrayItem(tray_update_);

AddTrayItem(tray_date_);

#endif

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