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

ash/system/system_notifier.cc

Index: ash/system/system_notifier.cc
diff --git a/ash/system/system_notifier.cc b/ash/system/system_notifier.cc
index 2910862a5a194ad27924408a55265ab5526cee1d..6bf6884ee446bcc12ca79f066d610083c3b68390 100644
--- a/ash/system/system_notifier.cc
+++ b/ash/system/system_notifier.cc
@@ -6,6 +6,10 @@
 
 #include "base/logging.h"
 
+#if defined(OS_CHROMEOS)
+#include "ui/chromeos/network/network_state_notifier.h"
+#endif
+
 namespace ash {
 namespace system_notifier {
 
@@ -16,7 +20,9 @@ namespace {
 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!
@@ -30,8 +36,10 @@ const char* kAshSystemNotifiers[] = {
   kNotifierDisplayResolutionChange,
   kNotifierLocale,
   kNotifierMultiProfileFirstRun,
-  kNotifierNetwork,
-  kNotifierNetworkError,
+#if defined(OS_CHROMEOS)
+  ui::NetworkStateNotifier::kNotifierNetwork,
+  ui::NetworkStateNotifier::kNotifierNetworkError,
+#endif
   kNotifierNetworkPortalDetector,
   kNotifierPower,
   kNotifierScreenshot,
@@ -64,8 +72,6 @@ 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";