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

Unified Diff: ash/common/system/tray/tray_image_item.cc

Issue 2576133002: chromeos: Remove OS ifdefs from ash/common/system/tray (Closed)
Patch Set: review comments Created 4 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/system/tray/system_tray_unittest.cc ('k') | ash/common/system/tray/tray_notification_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/tray_image_item.cc
diff --git a/ash/common/system/tray/tray_image_item.cc b/ash/common/system/tray/tray_image_item.cc
index 01400352859de51f38bde982928350f5a52ab394..04c5ae49c8b0afe8c3118c1ba139e5013ab6026b 100644
--- a/ash/common/system/tray/tray_image_item.cc
+++ b/ash/common/system/tray/tray_image_item.cc
@@ -29,18 +29,16 @@ const gfx::VectorIcon& ResourceIdToVectorIcon(int resource_id) {
switch (resource_id) {
case IDR_AURA_UBER_TRAY_ACCESSIBILITY:
return kSystemTrayAccessibilityIcon;
- case IDR_AURA_UBER_TRAY_UPDATE:
- return kSystemTrayUpdateIcon;
- case IDR_AURA_UBER_TRAY_VOLUME_MUTE:
- return kSystemTrayVolumeMuteIcon;
-#if defined(OS_CHROMEOS)
case IDR_AURA_UBER_TRAY_AUTO_ROTATION_LOCKED:
return kSystemTrayRotationLockLockedIcon;
case IDR_AURA_UBER_TRAY_CAPS_LOCK:
return kSystemTrayCapsLockIcon;
case IDR_AURA_UBER_TRAY_TRACING:
return kSystemTrayTracingIcon;
-#endif
+ case IDR_AURA_UBER_TRAY_UPDATE:
+ return kSystemTrayUpdateIcon;
+ case IDR_AURA_UBER_TRAY_VOLUME_MUTE:
+ return kSystemTrayVolumeMuteIcon;
default:
NOTREACHED();
break;
« no previous file with comments | « ash/common/system/tray/system_tray_unittest.cc ('k') | ash/common/system/tray/tray_notification_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698