Unify ActivateCellular into network_connect.cc

chrome/browser/chromeos/system/ash_system_tray_delegate.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 "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 745 matching lines @@
     }
     if (network->type() == flimflam::kTypeWifi ||
         network->type() == flimflam::kTypeWimax ||
         network->type() == flimflam::kTypeVPN) {
       // TODO(stevenjb): Replace with non-NetworkLibrary UI.
       Network* cros_network = CrosLibrary::Get()->GetNetworkLibrary()->
           FindNetworkByPath(network_id);
       NetworkConfigView::Show(cros_network, GetNativeWindow());
       return;
     }
-    if (network->type() == flimflam::kTypeCellular &&
-        (network->activation_state() != flimflam::kActivationStateActivated ||
-         network->cellular_out_of_credits())) {
-      ash::Shell::GetInstance()->delegate()->OpenMobileSetup(network_id);
+    if (network->type() == flimflam::kTypeCellular) {
+      if (network->activation_state() != flimflam::kActivationStateActivated)
+        network_connect::ActivateCellular(network_id);
+      else if (network->cellular_out_of_credits())
+        network_connect::ShowMobileSetup(network_id);
       return;
     }
     // No special configure or setup for |network_id|, show the settings UI.
     ShowNetworkSettings(network_id);
   }
 
   virtual void ConnectToNetwork(const std::string& network_id) OVERRIDE {
     DCHECK(!CommandLine::ForCurrentProcess()->HasSwitch(
         chromeos::switches::kUseNewNetworkConfigurationHandlers));
     network_connect::ConnectResult result =
@@ skipping 559 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new chromeos::SystemTrayDelegate();
 }
 
 }  // namespace chromeos