chromeos: Remove OS ifdefs from ash/common/system/tray

ash/common/system/tray/tray_image_item.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/system/tray/tray_image_item.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/tray_constants.h"
@@ skipping 11 matching lines @@
 
 namespace {
 
 // Maps a non-MD PNG resource id to its corresponding MD vector icon.
 // TODO(tdanderson): Remove this once material design is enabled by
 // default. See crbug.com/614453.
 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;
   }
 
   return gfx::kNoneIcon;
 }
 
 }  // namespace
 
@@ skipping 60 matching lines @@
     tray_view_->image_view()->SetImage(gfx::CreateVectorIcon(
         ResourceIdToVectorIcon(resource_id_), kTrayIconSize, icon_color_));
   } else {
     tray_view_->image_view()->SetImage(ui::ResourceBundle::GetSharedInstance()
                                            .GetImageNamed(resource_id_)
                                            .ToImageSkia());
   }
 }
 
 }  // namespace ash