Move network_connect code to ui/chromeos/network (Take 2)

ash/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/system/system_notifier.h"
 
 #include "base/logging.h"
 
+#if defined(OS_CHROMEOS)
+#include "ui/chromeos/network/network_state_notifier.h"
+#endif
+
 namespace ash {
 namespace system_notifier {
 
 namespace {
 
 // See http://dev.chromium.org/chromium-os/chromiumos-design-docs/
 // system-notifications for the reasoning.
 const char* kAlwaysShownNotifierIds[] = {
   kNotifierDisplay,
   kNotifierDisplayError,
-  kNotifierNetworkError,
+#if defined(OS_CHROMEOS)
+  ui::NetworkStateNotifier::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
 };
 
 const char* kAshSystemNotifiers[] = {
   kNotifierBluetooth,
   kNotifierDisplay,
   kNotifierDisplayError,
   kNotifierDisplayResolutionChange,
   kNotifierLocale,
   kNotifierMultiProfileFirstRun,
-  kNotifierNetwork,
-  kNotifierNetworkError,
+#if defined(OS_CHROMEOS)
+  ui::NetworkStateNotifier::kNotifierNetwork,
+  ui::NetworkStateNotifier::kNotifierNetworkError,
+#endif
   kNotifierNetworkPortalDetector,
   kNotifierPower,
   kNotifierScreenshot,
   kNotifierScreenCapture,
   kNotifierScreenShare,
   kNotifierSessionLengthTimeout,
   kNotifierSupervisedUser,
   // Note: Order doesn't matter here, so keep this in alphabetic order, don't
   // just add your stuff at the end!
   NULL
@@ skipping 12 matching lines @@
 }
 
 }  // namespace
 
 const char kNotifierBluetooth[] = "ash.bluetooth";
 const char kNotifierDisplay[] = "ash.display";
 const char kNotifierDisplayError[] = "ash.display.error";
 const char kNotifierDisplayResolutionChange[] = "ash.display.resolution-change";
 const char kNotifierLocale[] = "ash.locale";
 const char kNotifierMultiProfileFirstRun[] = "ash.multi-profile.first-run";
-const char kNotifierNetwork[] = "ash.network";
-const char kNotifierNetworkError[] = "ash.network.error";
 const char kNotifierNetworkPortalDetector[] = "ash.network.portal-detector";
 const char kNotifierPower[] = "ash.power";
 const char kNotifierScreenshot[] = "ash.screenshot";
 const char kNotifierScreenCapture[] = "ash.screen-capture";
 const char kNotifierScreenShare[] = "ash.screen-share";
 const char kNotifierSessionLengthTimeout[] = "ash.session-length-timeout";
 const char kNotifierSupervisedUser[] = "ash.locally-managed-user";
 
 bool ShouldAlwaysShowPopups(const message_center::NotifierId& notifier_id) {
   return MatchSystemNotifierId(notifier_id, kAlwaysShownNotifierIds);
 }
 
 bool IsAshSystemNotifier(const message_center::NotifierId& notifier_id) {
   return MatchSystemNotifierId(notifier_id, kAshSystemNotifiers);
 }
 
 }  // namespace system_notifier
 }  // namespace ash