Eliminate c/b/chromeos/options/network_connect.cc

ash/system/chromeos/network/network_connect.cc

Index: ash/system/chromeos/network/network_connect.cc
diff --git a/ash/system/chromeos/network/network_connect.cc b/ash/system/chromeos/network/network_connect.cc
index 688c9108704330e78d767de2cec543af1f644ca4..fd02fd09f1bf42276d6889c3bd42d45ab907f360 100644
--- a/ash/system/chromeos/network/network_connect.cc
+++ b/ash/system/chromeos/network/network_connect.cc
@@ -23,9 +23,11 @@
 #include "chromeos/network/network_profile_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
+#include "grit/ash_resources.h"
 #include "grit/ash_strings.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"
 
 using chromeos::DeviceState;
 using chromeos::NetworkConfigurationHandler;
@@ -34,6 +36,7 @@ using chromeos::NetworkHandler;
 using chromeos::NetworkProfile;
 using chromeos::NetworkProfileHandler;
 using chromeos::NetworkState;
+using chromeos::NetworkStateHandler;
 
 namespace ash {
 
@@ -87,8 +90,7 @@ void OnConnectFailed(const std::string& service_path,
 
   if (error_name == NetworkConnectionHandler::kErrorConnected ||
       error_name == NetworkConnectionHandler::kErrorConnecting) {
-    ash::Shell::GetInstance()->system_tray_delegate()->ShowNetworkSettings(
-        service_path);
+    network_connect::ShowNetworkSettings(service_path);
     return;
   }
 
@@ -124,8 +126,6 @@ void OnConnectSucceeded(const std::string& service_path) {
 void CallConnectToNetwork(const std::string& service_path,
                           bool check_error_state,
                           gfx::NativeWindow owning_window) {
-  NET_LOG_USER("ConnectToNetwork", service_path);
-
   ash::Shell::GetInstance()->system_tray_notifier()->NotifyClearNetworkMessage(
       NetworkObserver::ERROR_CONNECT_FAILED);
 
@@ -248,6 +248,7 @@ namespace network_connect {
 
 void ConnectToNetwork(const std::string& service_path,
                       gfx::NativeWindow owning_window) {
+  NET_LOG_USER("ConnectToNetwork", service_path);
   const bool check_error_state = true;
   CallConnectToNetwork(service_path, check_error_state, owning_window);
 }
@@ -273,8 +274,7 @@ void ActivateCellular(const std::string& service_path) {
     // used to activate the network. Only show the dialog, if an account
     // management URL is available.
     if (!cellular->payment_url().empty())
-      ash::Shell::GetInstance()->system_tray_delegate()->ShowMobileSetup(
-          service_path);
+      ShowMobileSetup(service_path);
     return;
   }
   if (cellular->activation_state() == flimflam::kActivationStateActivated) {
@@ -289,6 +289,33 @@ void ActivateCellular(const std::string& service_path) {
       base::Bind(&OnActivateFailed, service_path));
 }
 
+void ShowMobileSetup(const std::string& service_path) {
+  NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
+  const NetworkState* cellular = handler->GetNetworkState(service_path);
+  if (cellular && cellular->type() == flimflam::kTypeCellular &&
+      cellular->activation_state() != flimflam::kActivationStateActivated &&

[pneubeck (no reviews), 2013/08/20 08:32:26]

the first three conditions

  cellular && cellular->type() == flimflam::kTypeCellular &&
  cellular->activation_state() != flimflam::kActivationStateActivated

could, but don't have to, be moved in front and lead to a LOG_ERROR/return (and
prevent showing the MobileSetupDialog as well).

[stevenjb, 2013/08/20 20:47:43]

I think we may want show MobileSetupDialog even if ActivationState != Activated,
but I will early exit / error on the first two.

+      cellular->activate_over_non_cellular_networks() &&
+      !handler->DefaultNetwork()) {
+    std::string technology = cellular->network_technology();
+    ash::NetworkObserver::NetworkType network_type =
+        (technology == flimflam::kNetworkTechnologyLte ||
+         technology == flimflam::kNetworkTechnologyLteAdvanced)
+        ? ash::NetworkObserver::NETWORK_CELLULAR_LTE
+        : ash::NetworkObserver::NETWORK_CELLULAR;
+    ash::Shell::GetInstance()->system_tray_notifier()->NotifySetNetworkMessage(
+        NULL,
+        ash::NetworkObserver::ERROR_CONNECT_FAILED,
+        network_type,
+        l10n_util::GetStringUTF16(IDS_NETWORK_ACTIVATION_ERROR_TITLE),
+        l10n_util::GetStringFUTF16(IDS_NETWORK_ACTIVATION_NEEDS_CONNECTION,
+                                   UTF8ToUTF16((cellular->name()))),
+        std::vector<string16>());
+    return;
+  }
+  ash::Shell::GetInstance()->system_tray_delegate()->ShowMobileSetupDialog(
+      service_path);
+}
+
 void ConfigureNetworkAndConnect(const std::string& service_path,
                                 const base::DictionaryValue& properties,
                                 bool shared) {
@@ -395,5 +422,12 @@ string16 ErrorString(const std::string& error) {
                                     UTF8ToUTF16(error));
 }
 
+void ShowNetworkSettings(const std::string& service_path) {
+  if (!ash::Shell::HasInstance())

[pneubeck (no reviews), 2013/08/20 08:32:26]

should the other functions check this as well?

[stevenjb, 2013/08/20 20:47:43]

Yes, at least anything that gets called by a callback; good catch.

+    return;
+  ash::Shell::GetInstance()->system_tray_delegate()->ShowNetworkSettings(
+      service_path);
+}
+
 }  // network_connect
 }  // ash