Move NetworkStateNotifier and NetworkConnect from src/ui

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"
 
-#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.
 
 // |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[] = {
     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
     // 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)
-    ui::NetworkStateNotifier::kNotifierNetwork,
+    kNotifierNetwork,
 #endif
     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[]) {
@@ skipping 13 matching lines @@
 const char kNotifierBluetooth[] = "ash.bluetooth";
 const char kNotifierDeprecatedAccelerator[] = "ash.accelerator-controller";
 const char kNotifierDisk[] = "ash.disk";
 const char kNotifierDisplay[] = "ash.display";
 const char kNotifierDisplayError[] = "ash.display.error";
 const char kNotifierDisplayResolutionChange[] = "ash.display.resolution-change";
 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";
 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";
 const char kNotifierWebUsb[] = "ash.webusb";
 
 bool ShouldAlwaysShowPopups(const message_center::NotifierId& notifier_id) {
   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