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

Side by Side 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: Fix a logic error in the delegate, and a few nits. 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 unified diff | Download patch | Annotate | Revision Log
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/tray/system_tray.h" 5 #include "ash/system/tray/system_tray.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/metrics/user_metrics_recorder.h" 8 #include "ash/metrics/user_metrics_recorder.h"
9 #include "ash/shelf/shelf_layout_manager.h" 9 #include "ash/shelf/shelf_layout_manager.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 #include "ash/system/chromeos/network/tray_network.h" 55 #include "ash/system/chromeos/network/tray_network.h"
56 #include "ash/system/chromeos/network/tray_sms.h" 56 #include "ash/system/chromeos/network/tray_sms.h"
57 #include "ash/system/chromeos/network/tray_vpn.h" 57 #include "ash/system/chromeos/network/tray_vpn.h"
58 #include "ash/system/chromeos/power/tray_power.h" 58 #include "ash/system/chromeos/power/tray_power.h"
59 #include "ash/system/chromeos/screen_security/screen_capture_tray_item.h" 59 #include "ash/system/chromeos/screen_security/screen_capture_tray_item.h"
60 #include "ash/system/chromeos/screen_security/screen_share_tray_item.h" 60 #include "ash/system/chromeos/screen_security/screen_share_tray_item.h"
61 #include "ash/system/chromeos/settings/tray_settings.h" 61 #include "ash/system/chromeos/settings/tray_settings.h"
62 #include "ash/system/chromeos/tray_display.h" 62 #include "ash/system/chromeos/tray_display.h"
63 #include "ash/system/chromeos/tray_tracing.h" 63 #include "ash/system/chromeos/tray_tracing.h"
64 #include "ui/message_center/message_center.h" 64 #include "ui/message_center/message_center.h"
65 #elif defined(OS_WIN)
66 #include "ash/system/win/audio/tray_audio_win.h"
67 #include "media/audio/win/core_audio_util_win.h"
65 #endif 68 #endif
66 69
67 using views::TrayBubbleView; 70 using views::TrayBubbleView;
68 71
69 namespace ash { 72 namespace ash {
70 73
71 // The minimum width of the system tray menu width. 74 // The minimum width of the system tray menu width.
72 const int kMinimumSystemTrayMenuWidth = 300; 75 const int kMinimumSystemTrayMenuWidth = 300;
73 76
74 namespace internal { 77 namespace internal {
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 AddTrayItem(new internal::ScreenCaptureTrayItem(this)); 200 AddTrayItem(new internal::ScreenCaptureTrayItem(this));
198 AddTrayItem(new internal::ScreenShareTrayItem(this)); 201 AddTrayItem(new internal::ScreenShareTrayItem(this));
199 AddTrayItem(new internal::TrayAudioChromeOs(this)); 202 AddTrayItem(new internal::TrayAudioChromeOs(this));
200 AddTrayItem(new internal::TrayBrightness(this)); 203 AddTrayItem(new internal::TrayBrightness(this));
201 AddTrayItem(new internal::TrayCapsLock(this)); 204 AddTrayItem(new internal::TrayCapsLock(this));
202 AddTrayItem(new internal::TraySettings(this)); 205 AddTrayItem(new internal::TraySettings(this));
203 AddTrayItem(new internal::TrayUpdate(this)); 206 AddTrayItem(new internal::TrayUpdate(this));
204 AddTrayItem(tray_date_); 207 AddTrayItem(tray_date_);
205 #elif defined(OS_WIN) 208 #elif defined(OS_WIN)
206 AddTrayItem(tray_accessibility_); 209 AddTrayItem(tray_accessibility_);
210 if (media::CoreAudioUtil::IsSupported())
henrika (OOO until Aug 14) 2014/02/26 09:10:05 Just checking. What happens on Windows XP here?
zturner 2014/02/26 17:50:29 "Windows Ash" is mostly synonymous with "Chrome Wi
211 AddTrayItem(new internal::TrayAudioWin(this));
207 AddTrayItem(new internal::TrayUpdate(this)); 212 AddTrayItem(new internal::TrayUpdate(this));
208 AddTrayItem(tray_date_); 213 AddTrayItem(tray_date_);
209 #elif defined(OS_LINUX) 214 #elif defined(OS_LINUX)
210 AddTrayItem(new internal::TrayIME(this)); 215 AddTrayItem(new internal::TrayIME(this));
211 AddTrayItem(tray_accessibility_); 216 AddTrayItem(tray_accessibility_);
212 AddTrayItem(new internal::TrayBluetooth(this)); 217 AddTrayItem(new internal::TrayBluetooth(this));
213 AddTrayItem(new internal::TrayDrive(this)); 218 AddTrayItem(new internal::TrayDrive(this));
214 AddTrayItem(new internal::TrayCapsLock(this)); 219 AddTrayItem(new internal::TrayCapsLock(this));
215 AddTrayItem(new internal::TrayUpdate(this)); 220 AddTrayItem(new internal::TrayUpdate(this));
216 AddTrayItem(tray_date_); 221 AddTrayItem(tray_date_);
(...skipping 511 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 system_bubble_.reset(); 733 system_bubble_.reset();
729 // When closing a system bubble with the alternate shelf layout, we need to 734 // When closing a system bubble with the alternate shelf layout, we need to
730 // turn off the active tinting of the shelf. 735 // turn off the active tinting of the shelf.
731 if (full_system_tray_menu_) { 736 if (full_system_tray_menu_) {
732 SetDrawBackgroundAsActive(false); 737 SetDrawBackgroundAsActive(false);
733 full_system_tray_menu_ = false; 738 full_system_tray_menu_ = false;
734 } 739 }
735 } 740 }
736 741
737 } // namespace ash 742 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698