Configure networks requiring a certificate.

chrome/browser/chromeos/options/network_connect.cc

 // Copyright (c) 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 "chrome/browser/chromeos/options/network_connect.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/chromeos/network/network_connect.h"
 #include "ash/system/chromeos/network/network_observer.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/enrollment_dialog_view.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
+#include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
 #include "chromeos/chromeos_switches.h"
 #include "grit/generated_resources.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
 namespace network_connect {
 
@@ skipping 100 matching lines @@
   Network* network = cros->FindNetworkByPath(service_path);
   if (!network)
     return NETWORK_NOT_FOUND;
 
   if (network->connecting_or_connected())
     return CONNECT_NOT_STARTED;
 
   if (network->type() == TYPE_ETHERNET)
     return CONNECT_NOT_STARTED;  // Normally this shouldn't happen
 
-  if (network->type() == TYPE_WIFI) {
-    WifiNetwork* wifi = static_cast<WifiNetwork*>(network);
-    wifi->SetEnrollmentDelegate(
-        chromeos::CreateEnrollmentDelegate(
-            parent_window,
-            wifi->name(),
-            ProfileManager::GetLastUsedProfile()));
-    wifi->AttemptConnection(base::Bind(&DoConnect, wifi, parent_window));
+  if (network->type() == TYPE_WIFI || network->type() == TYPE_VPN) {
+    network->SetEnrollmentDelegate(chromeos::CreateEnrollmentDelegate(
+        parent_window, network->name(), ProfileManager::GetLastUsedProfile()));
+    network->AttemptConnection(base::Bind(&DoConnect, network, parent_window));
     return CONNECT_STARTED;
   }
 
   if (network->type() == TYPE_WIMAX) {
     WimaxNetwork* wimax = static_cast<WimaxNetwork*>(network);
     wimax->AttemptConnection(base::Bind(&DoConnect, wimax, parent_window));
     return CONNECT_STARTED;
   }
 
   if (network->type() == TYPE_CELLULAR) {
     CellularNetwork* cellular = static_cast<CellularNetwork*>(network);
     if (cellular->NeedsActivation() || cellular->out_of_credits()) {
       ActivateCellular(service_path);
       return CONNECT_STARTED;
     }
     if (cellular->activation_state() == ACTIVATION_STATE_ACTIVATING)
       return CONNECT_NOT_STARTED;
     cros->ConnectToCellularNetwork(cellular);
     return CONNECT_STARTED;
   }
 
-  if (network->type() == TYPE_VPN) {
-    VirtualNetwork* vpn = static_cast<VirtualNetwork*>(network);
-    vpn->SetEnrollmentDelegate(
-        chromeos::CreateEnrollmentDelegate(
-            parent_window,
-            vpn->name(),
-            ProfileManager::GetLastUsedProfile()));
-    vpn->AttemptConnection(base::Bind(&DoConnect, vpn, parent_window));
-    return CONNECT_STARTED;
-  }
-
   NOTREACHED();
   return CONNECT_NOT_STARTED;
 }
 
+void ConfigureNetwork(const std::string& service_path,
+                      gfx::NativeWindow parent_window) {
+  NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
+  Network* network = cros->FindNetworkByPath(service_path);
+  if (!network)

[pneubeck (no reviews), 2013/06/06 20:41:20]

Maybe LOG(ERROR)/WARNING.

[stevenjb, 2013/06/07 03:44:58]

Done.

+    return;
+
+  if (network->type() == TYPE_WIFI || network->type() == TYPE_VPN) {
+    network->SetEnrollmentDelegate(chromeos::CreateEnrollmentDelegate(
+        parent_window, network->name(), ProfileManager::GetLastUsedProfile()));
+    // This will connect to the network only if the network just needs to have
+    // its certificate configured. Otherwise it will show an enrollment dialog
+    // if available, or call NetworkConfigView::Show().
+    network->AttemptConnection(
+        base::Bind(&NetworkConfigView::Show, network, parent_window));
+    return;
+  }
+
+  if (network->type() == TYPE_WIMAX) {
+    NetworkConfigView::Show(network, parent_window);
+    return;
+  }
+
+  if (network->type() == TYPE_CELLULAR) {
+    CellularNetwork* cellular = static_cast<CellularNetwork*>(network);
+    if (cellular->NeedsActivation()) {
+      ActivateCellular(service_path);
+      return;
+    } else if (cellular->out_of_credits()) {
+      ShowMobileSetup(service_path);
+      return;
+    }
+  }
+
+  // No special configure or setup for |service_path|, show the settings UI.
+  ash::Shell::GetInstance()->system_tray_delegate()->ShowNetworkSettings(

[pneubeck (no reviews), 2013/06/06 20:41:20]

This accesses ash to get the delegate that was previously set from
chrome/browser/chromeos,
only to again open the settings page living in chrome/browser/chromeos.
Although we're already in chrome/browser/chromeos.

Can't you access the settings page directly.
This call also again uses NetworkState handler, which seem to have avoided
above.

[stevenjb, 2013/06/07 03:44:58]

Yeah, I agree, it's ugly. I really can't wait to remove this code entirely. I
was hoping to avoid some copy/paste code, but since it is going away...
Done.

btw, in case you're wondering - kInternetOptionsSubPage recognizes either a
string type or a numerical type. See
InternetOptionsHandler::NetworkCommandCallback.

+      service_path);
+}
+
 }  // namespace network_connect
 }  // namespace chromeos