Remove non-cros support from ash/common/system.

ash/common/system/system_notifier.cc

 // Copyright 2013 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/system_notifier.h"
 
 #include "base/logging.h"
 
 namespace ash {
 namespace system_notifier {
 
 namespace {
 
 // See http://dev.chromium.org/chromium-os/chromiumos-design-docs/
 // system-notifications for the reasoning.
 
 // |kAlwaysShownSystemNotifierIds| is the list of system notification sources
 // which can appear regardless of the situation, such like login screen or lock
 // screen.
 const char* kAlwaysShownSystemNotifierIds[] = {
     kNotifierAccessibility, kNotifierDeprecatedAccelerator, kNotifierBattery,
     kNotifierDisplay, kNotifierDisplayError,
-#if defined(OS_CHROMEOS)
     kNotifierNetworkError,
-#endif
     kNotifierPower,
     // Note: Order doesn't matter here, so keep this in alphabetic order, don't
     // just add your stuff at the end!
     NULL};
 
 // |kAshSystemNotifiers| is the list of normal system notification sources for
 // ash events. These notifications can be hidden in some context.
 const char* kAshSystemNotifiers[] = {
-    kNotifierBluetooth, kNotifierDisplayResolutionChange,
-#if defined(OS_CHROMEOS)
-    kNotifierDisk,
-#endif
-    kNotifierLocale, kNotifierMultiProfileFirstRun,
-#if defined(OS_CHROMEOS)
-    kNotifierNetwork,
-#endif
+    kNotifierBluetooth, kNotifierDisplayResolutionChange, kNotifierDisk,
+    kNotifierLocale, kNotifierMultiProfileFirstRun, kNotifierNetwork,
     kNotifierNetworkPortalDetector, kNotifierScreenshot, kNotifierScreenCapture,
     kNotifierScreenShare, kNotifierSessionLengthTimeout,
     kNotifierSupervisedUser, kNotifierWebUsb,
     // Note: Order doesn't matter here, so keep this in alphabetic order, don't
     // just add your stuff at the end!
     NULL};
 
 bool MatchSystemNotifierId(const message_center::NotifierId& notifier_id,
                            const char* id_list[]) {
   if (notifier_id.type != message_center::NotifierId::SYSTEM_COMPONENT)
@@ skipping 36 matching lines @@
   return MatchSystemNotifierId(notifier_id, kAlwaysShownSystemNotifierIds);
 }
 
 bool IsAshSystemNotifier(const message_center::NotifierId& notifier_id) {
   return ShouldAlwaysShowPopups(notifier_id) ||
          MatchSystemNotifierId(notifier_id, kAshSystemNotifiers);
 }
 
 }  // namespace system_notifier
 }  // namespace ash