Move NetworkStateNotifier and NetworkConnect from src/ui

ash/common/system/system_notifier.cc

Index: ash/common/system/system_notifier.cc
diff --git a/ash/common/system/system_notifier.cc b/ash/common/system/system_notifier.cc
index b85815e85f997bfdc1f2d7a5450ff73776512caa..05b31c681101412a3581cd720c23653b53e0a2ca 100644
--- a/ash/common/system/system_notifier.cc
+++ b/ash/common/system/system_notifier.cc
@@ -6,10 +6,6 @@
 
 #include "base/logging.h"
 
-#if defined(OS_CHROMEOS)
-#include "ui/chromeos/network/network_state_notifier.h"
-#endif
-
 namespace ash {
 namespace system_notifier {
 
@@ -25,7 +21,7 @@ const char* kAlwaysShownSystemNotifierIds[] = {
     kNotifierDeprecatedAccelerator, kNotifierBattery, kNotifierDisplay,
     kNotifierDisplayError,
 #if defined(OS_CHROMEOS)
-    ui::NetworkStateNotifier::kNotifierNetworkError,
+    kNotifierNetworkError,
 #endif
     kNotifierPower,
     // Note: Order doesn't matter here, so keep this in alphabetic order, don't
@@ -41,7 +37,7 @@ const char* kAshSystemNotifiers[] = {
 #endif
     kNotifierLocale, kNotifierMultiProfileFirstRun,
 #if defined(OS_CHROMEOS)
-    ui::NetworkStateNotifier::kNotifierNetwork,
+    kNotifierNetwork,
 #endif
     kNotifierNetworkPortalDetector, kNotifierScreenshot, kNotifierScreenCapture,
     kNotifierScreenShare, kNotifierSessionLengthTimeout,
@@ -75,6 +71,8 @@ const char kNotifierDualRole[] = "ash.dual-role";
 const char kNotifierHats[] = "ash.hats";
 const char kNotifierLocale[] = "ash.locale";
 const char kNotifierMultiProfileFirstRun[] = "ash.multi-profile.first-run";
+const char kNotifierNetwork[] = "ui.chromeos.network";

[James Cook, 2016/10/20 00:11:43]

Where are these declared?

[stevenjb, 2016/10/20 00:57:22]

They are already in the header even though they weren't in the .cc file. Not
sure how/why.

+const char kNotifierNetworkError[] = "ui.chromeos.network.error";

[James Cook, 2016/10/20 00:11:43]

Also, should they still start with "ui.chromeos" or "ash."?  I'm not sure if the
message center keeps track of historical suppressions by name, so it might need
to be the former, but if not then the latter would be nice for consistency.

[stevenjb, 2016/10/20 00:57:22]

Renamed to ash.

 const char kNotifierNetworkPortalDetector[] = "ash.network.portal-detector";
 const char kNotifierPower[] = "ash.power";
 const char kNotifierQuickUnlock[] = "ash.quickunlock";