Move NetworkStateNotifier and NetworkConnect from src/ui

chrome/browser/chromeos/net/network_state_notifier.cc

 // Copyright (c) 2012 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 "ui/chromeos/network/network_state_notifier.h"
+#include "chrome/browser/chromeos/net/network_state_notifier.h"
 
+#include "ash/common/system/system_notifier.h"
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/chromeos/net/shill_error.h"
+#include "chrome/browser/ui/ash/system_tray_client.h"
+#include "chrome/grit/generated_resources.h"
 #include "chromeos/network/network_configuration_handler.h"
 #include "chromeos/network/network_connection_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/shill_property_util.h"
 #include "components/device_event_log/device_event_log.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "ui/chromeos/network/network_connect.h"
 #include "ui/chromeos/resources/grit/ui_chromeos_resources.h"
-#include "ui/chromeos/strings/grit/ui_chromeos_strings.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 
-using chromeos::NetworkConnectionHandler;
-using chromeos::NetworkHandler;
-using chromeos::NetworkState;
-using chromeos::NetworkStateHandler;
-using chromeos::NetworkTypePattern;
+namespace chromeos {
 
 namespace {
 
 const int kMinTimeBetweenOutOfCreditsNotifySeconds = 10 * 60;
 
 // Ignore in-progress error.
 bool ShillErrorIsIgnored(const std::string& shill_error) {
   if (shill_error == shill::kErrorResultInProgress)
     return true;
   return false;
 }
 
 // Error messages based on |error_name|, not network_state->error().
 base::string16 GetConnectErrorString(const std::string& error_name) {
   if (error_name == NetworkConnectionHandler::kErrorNotFound)
     return l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_CONNECT_FAILED);
   if (error_name == NetworkConnectionHandler::kErrorConfigureFailed) {
     return l10n_util::GetStringUTF16(
         IDS_CHROMEOS_NETWORK_ERROR_CONFIGURE_FAILED);
   }
   if (error_name == NetworkConnectionHandler::kErrorCertLoadTimeout) {
     return l10n_util::GetStringUTF16(
         IDS_CHROMEOS_NETWORK_ERROR_CERTIFICATES_NOT_LOADED);
   }
-  if (error_name == ui::NetworkConnect::kErrorActivateFailed) {
+  if (error_name == NetworkConnectionHandler::kErrorActivateFailed) {
     return l10n_util::GetStringUTF16(
         IDS_CHROMEOS_NETWORK_ERROR_ACTIVATION_FAILED);
   }
   return base::string16();
 }
 
 int GetErrorNotificationIconId(const std::string& network_type) {
   if (network_type == shill::kTypeVPN)
     return IDR_AURA_UBER_TRAY_NETWORK_VPN;
   if (network_type == shill::kTypeCellular)
     return IDR_AURA_UBER_TRAY_NETWORK_FAILED_CELLULAR;
   return IDR_AURA_UBER_TRAY_NETWORK_FAILED;
 }
 
 void ShowErrorNotification(const std::string& service_path,
                            const std::string& notification_id,
                            const std::string& network_type,
                            const base::string16& title,
                            const base::string16& message,
                            const base::Closure& callback) {
   NET_LOG(ERROR) << "ShowErrorNotification: " << service_path << ": "
                  << base::UTF16ToUTF8(title);
   const gfx::Image& icon =
       ui::ResourceBundle::GetSharedInstance().GetImageNamed(
           GetErrorNotificationIconId(network_type));
   message_center::MessageCenter::Get()->AddNotification(
       message_center::Notification::CreateSystemNotification(
           notification_id, title, message, icon,
-          ui::NetworkStateNotifier::kNotifierNetworkError, callback));
+          ash::system_notifier::kNotifierNetworkError, callback));
 }
 
 }  // namespace
 
-namespace ui {
-
-const char NetworkStateNotifier::kNotifierNetwork[] = "ui.chromeos.network";
-const char NetworkStateNotifier::kNotifierNetworkError[] =
-    "ui.chromeos.network.error";
-
 const char NetworkStateNotifier::kNetworkConnectNotificationId[] =
     "chrome://settings/internet/connect";
 const char NetworkStateNotifier::kNetworkActivateNotificationId[] =
     "chrome://settings/internet/activate";
 const char NetworkStateNotifier::kNetworkOutOfCreditsNotificationId[] =
     "chrome://settings/internet/out-of-credits";
 
-NetworkStateNotifier::NetworkStateNotifier(NetworkConnect* network_connect)
-    : network_connect_(network_connect),
-      did_show_out_of_credits_(false),
-      weak_ptr_factory_(this) {
+NetworkStateNotifier::NetworkStateNotifier()
+    : did_show_out_of_credits_(false), weak_ptr_factory_(this) {
   if (!NetworkHandler::IsInitialized())
     return;
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   handler->AddObserver(this, FROM_HERE);
   UpdateDefaultNetwork(handler->DefaultNetwork());
   NetworkHandler::Get()->network_connection_handler()->AddObserver(this);
 }
 
 NetworkStateNotifier::~NetworkStateNotifier() {
   if (!NetworkHandler::IsInitialized())
@@ skipping 110 matching lines @@
 
   did_show_out_of_credits_ = true;
   base::TimeDelta dtime = base::Time::Now() - out_of_credits_notify_time_;
   if (dtime.InSeconds() > kMinTimeBetweenOutOfCreditsNotifySeconds) {
     out_of_credits_notify_time_ = base::Time::Now();
     base::string16 error_msg = l10n_util::GetStringFUTF16(
         IDS_NETWORK_OUT_OF_CREDITS_BODY, base::UTF8ToUTF16(cellular->name()));
     ShowErrorNotification(
         cellular->path(), kNetworkOutOfCreditsNotificationId, cellular->type(),
         l10n_util::GetStringUTF16(IDS_NETWORK_OUT_OF_CREDITS_TITLE), error_msg,
-        base::Bind(&NetworkStateNotifier::ShowNetworkSettingsForPath,
-                   weak_ptr_factory_.GetWeakPtr(), cellular->path()));
+        base::Bind(&NetworkStateNotifier::ShowNetworkSettings,
+                   weak_ptr_factory_.GetWeakPtr(), cellular->guid()));
   }
 }
 
 void NetworkStateNotifier::UpdateCellularActivating(
     const NetworkState* cellular) {
   // Keep track of any activating cellular network.
   std::string activation_state = cellular->activation_state();
   if (activation_state == shill::kActivationStateActivating) {
     cellular_activating_.insert(cellular->path());
     return;
@@ skipping 11 matching lines @@
   else
     icon_id = IDR_AURA_UBER_TRAY_NOTIFICATION_3G;
   const gfx::Image& icon =
       ui::ResourceBundle::GetSharedInstance().GetImageNamed(icon_id);
   message_center::MessageCenter::Get()->AddNotification(
       message_center::Notification::CreateSystemNotification(
           kNetworkActivateNotificationId,
           l10n_util::GetStringUTF16(IDS_NETWORK_CELLULAR_ACTIVATED_TITLE),
           l10n_util::GetStringFUTF16(IDS_NETWORK_CELLULAR_ACTIVATED,
                                      base::UTF8ToUTF16((cellular->name()))),
-          icon, kNotifierNetwork,
-          base::Bind(&NetworkStateNotifier::ShowNetworkSettingsForPath,
-                     weak_ptr_factory_.GetWeakPtr(), cellular->path())));
+          icon, ash::system_notifier::kNotifierNetwork,
+          base::Bind(&NetworkStateNotifier::ShowNetworkSettings,
+                     weak_ptr_factory_.GetWeakPtr(), cellular->guid())));
 }
 
 void NetworkStateNotifier::ShowNetworkConnectError(
     const std::string& error_name,
     const std::string& service_path) {
   if (service_path.empty()) {
     base::DictionaryValue shill_properties;
     ShowConnectErrorNotification(error_name, service_path, shill_properties);
     return;
   }
@@ skipping 17 matching lines @@
     return;
   }
   message_center::MessageCenter::Get()->AddNotification(
       message_center::Notification::CreateSystemNotification(
           kNetworkActivateNotificationId,
           l10n_util::GetStringUTF16(IDS_NETWORK_ACTIVATION_ERROR_TITLE),
           l10n_util::GetStringFUTF16(IDS_NETWORK_ACTIVATION_NEEDS_CONNECTION,
                                      base::UTF8ToUTF16(cellular->name())),
           ui::ResourceBundle::GetSharedInstance().GetImageNamed(
               IDR_AURA_UBER_TRAY_NETWORK_FAILED_CELLULAR),
-          kNotifierNetworkError,
-          base::Bind(&NetworkStateNotifier::ShowNetworkSettingsForPath,
-                     weak_ptr_factory_.GetWeakPtr(), service_path)));
+          ash::system_notifier::kNotifierNetworkError,
+          base::Bind(&NetworkStateNotifier::ShowNetworkSettings,
+                     weak_ptr_factory_.GetWeakPtr(), cellular->guid())));
 }
 
 void NetworkStateNotifier::RemoveConnectNotification() {
   message_center::MessageCenter* message_center =
       message_center::MessageCenter::Get();
   if (message_center) {
     message_center->RemoveNotification(kNetworkConnectNotificationId,
                                        false /* not by user */);
   }
 }
 
 void NetworkStateNotifier::ConnectErrorPropertiesSucceeded(
     const std::string& error_name,
     const std::string& service_path,
     const base::DictionaryValue& shill_properties) {
   std::string state;
   shill_properties.GetStringWithoutPathExpansion(shill::kStateProperty, &state);
-  if (chromeos::NetworkState::StateIsConnected(state) ||
-      chromeos::NetworkState::StateIsConnecting(state)) {
+  if (NetworkState::StateIsConnected(state) ||
+      NetworkState::StateIsConnecting(state)) {
     // Network is no longer in an error state. This can happen if an
     // unexpected idle state transition occurs, see crbug.com/333955.
     return;
   }
   ShowConnectErrorNotification(error_name, service_path, shill_properties);
 }
 
 void NetworkStateNotifier::ConnectErrorPropertiesFailed(
     const std::string& error_name,
     const std::string& service_path,
     const std::string& shill_connect_error,
     std::unique_ptr<base::DictionaryValue> shill_error_data) {
   base::DictionaryValue shill_properties;
   ShowConnectErrorNotification(error_name, service_path, shill_properties);
 }
 
 void NetworkStateNotifier::ShowConnectErrorNotification(
     const std::string& error_name,
     const std::string& service_path,
     const base::DictionaryValue& shill_properties) {
   base::string16 error = GetConnectErrorString(error_name);
   NET_LOG(DEBUG) << "Notify: " << service_path
                  << ": Connect error: " << error_name << ": "
                  << base::UTF16ToUTF8(error);
+
+  const NetworkState* network =
+      NetworkHandler::Get()->network_state_handler()->GetNetworkState(
+          service_path);
+  std::string guid = network ? network->guid() : "";
+
   if (error.empty()) {
     std::string shill_error;
     shill_properties.GetStringWithoutPathExpansion(shill::kErrorProperty,
                                                    &shill_error);
-    if (!chromeos::NetworkState::ErrorIsValid(shill_error)) {
+    if (!NetworkState::ErrorIsValid(shill_error)) {
       shill_properties.GetStringWithoutPathExpansion(
           shill::kPreviousErrorProperty, &shill_error);
       NET_LOG(DEBUG) << "Notify: " << service_path
                      << ": Service.PreviousError: " << shill_error;
-      if (!chromeos::NetworkState::ErrorIsValid(shill_error))
+      if (!NetworkState::ErrorIsValid(shill_error))
         shill_error.clear();
     } else {
       NET_LOG(DEBUG) << "Notify: " << service_path
                      << ": Service.Error: " << shill_error;
     }
 
-    const NetworkState* network =
-        NetworkHandler::Get()->network_state_handler()->GetNetworkState(
-            service_path);
     if (network) {
       // Always log last_error, but only use it if shill_error is empty.
       // TODO(stevenjb): This shouldn't ever be necessary, but is kept here as
       // a failsafe since more information is better than less when debugging
       // and we have encountered some strange edge cases before.
       NET_LOG(DEBUG) << "Notify: " << service_path
                      << ": Network.last_error: " << network->last_error();
       if (shill_error.empty())
         shill_error = network->last_error();
     }
 
     if (ShillErrorIsIgnored(shill_error)) {
       NET_LOG(DEBUG) << "Notify: " << service_path
                      << ": Ignoring error: " << error_name;
       return;
     }
-
-    error = network_connect_->GetShillErrorString(shill_error, service_path);
+    error = shill_error::GetShillErrorString(shill_error, guid);
     if (error.empty()) {
       if (error_name == NetworkConnectionHandler::kErrorConnectFailed &&
           network && !network->connectable()) {
         // Connect failure on non connectable network with no additional
         // information. We expect the UI to show configuration UI so do not
         // show an additional (and unhelpful) notification.
         return;
       }
       error = l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_UNKNOWN);
     }
   }
   NET_LOG(ERROR) << "Notify: " << service_path
                  << ": Connect error: " + base::UTF16ToUTF8(error);
 
-  std::string network_name =
-      chromeos::shill_property_util::GetNameFromProperties(service_path,
-                                                           shill_properties);
+  std::string network_name = shill_property_util::GetNameFromProperties(
+      service_path, shill_properties);
   std::string network_error_details;
   shill_properties.GetStringWithoutPathExpansion(shill::kErrorDetailsProperty,
                                                  &network_error_details);
 
   base::string16 error_msg;
   if (!network_error_details.empty()) {
     // network_name should't be empty if network_error_details is set.
     error_msg = l10n_util::GetStringFUTF16(
         IDS_NETWORK_CONNECTION_ERROR_MESSAGE_WITH_SERVER_MESSAGE,
         base::UTF8ToUTF16(network_name), error,
         base::UTF8ToUTF16(network_error_details));
   } else if (network_name.empty()) {
     error_msg = l10n_util::GetStringFUTF16(
         IDS_NETWORK_CONNECTION_ERROR_MESSAGE_NO_NAME, error);
   } else {
     error_msg =
         l10n_util::GetStringFUTF16(IDS_NETWORK_CONNECTION_ERROR_MESSAGE,
                                    base::UTF8ToUTF16(network_name), error);
   }
 
   std::string network_type;
   shill_properties.GetStringWithoutPathExpansion(shill::kTypeProperty,
                                                  &network_type);
 
   ShowErrorNotification(
       service_path, kNetworkConnectNotificationId, network_type,
       l10n_util::GetStringUTF16(IDS_NETWORK_CONNECTION_ERROR_TITLE), error_msg,
-      base::Bind(&NetworkStateNotifier::ShowNetworkSettingsForPath,
-                 weak_ptr_factory_.GetWeakPtr(), service_path));
+      base::Bind(&NetworkStateNotifier::ShowNetworkSettings,
+                 weak_ptr_factory_.GetWeakPtr(), guid));
 }
 
 void NetworkStateNotifier::ShowVpnDisconnectedNotification(
     const NetworkState* vpn) {
   base::string16 error_msg = l10n_util::GetStringFUTF16(
       IDS_NETWORK_VPN_CONNECTION_LOST_BODY, base::UTF8ToUTF16(vpn->name()));
   ShowErrorNotification(
       vpn->path(), kNetworkConnectNotificationId, shill::kTypeVPN,
       l10n_util::GetStringUTF16(IDS_NETWORK_VPN_CONNECTION_LOST_TITLE),
-      error_msg, base::Bind(&NetworkStateNotifier::ShowNetworkSettingsForPath,
-                            weak_ptr_factory_.GetWeakPtr(), vpn->path()));
+      error_msg, base::Bind(&NetworkStateNotifier::ShowNetworkSettings,
+                            weak_ptr_factory_.GetWeakPtr(), vpn->guid()));
 }
 
-void NetworkStateNotifier::ShowNetworkSettingsForPath(
-    const std::string& service_path) {
-  network_connect_->ShowNetworkSettingsForPath(service_path);
+void NetworkStateNotifier::ShowNetworkSettings(const std::string& network_id) {
+  if (!SystemTrayClient::Get())
+    return;
+  SystemTrayClient::Get()->ShowNetworkSettings(network_id);
 }
 
-}  // namespace ui
+}  // namespace chromeos