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

Unified Diff: ash/system/tray/system_tray.cc

Issue 178883004: Enable the volume slider in Ash for windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 59f69707885d7e509a3cb5dc91e5f9b665557c36..344fe587ac1b80c064710b109691d2d81170a244 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -62,6 +62,9 @@
#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;
@@ -204,6 +207,8 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
AddTrayItem(tray_date_);
#elif defined(OS_WIN)
AddTrayItem(tray_accessibility_);
+ if (media::CoreAudioUtil::IsSupported())
tommi (sloooow) - chröme 2014/02/25 16:47:38 are you on the UI thread here? There's a race in
zturner 2014/02/25 17:19:56 Yes, it's from the UI thread. I will double check
zturner 2014/02/25 17:52:00 This is indeed called from the main thread before
tommi (sloooow) - chröme 2014/02/26 11:10:44 Great. thanks for checking. Yes, fine as is then.
+ AddTrayItem(new internal::TrayAudioWin(this));
AddTrayItem(new internal::TrayUpdate(this));
AddTrayItem(tray_date_);
#elif defined(OS_LINUX)

Powered by Google App Engine
This is Rietveld 408576698