Network Setup from Shark to Remora.

chrome/browser/chromeos/login/wizard_controller.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/login/wizard_controller.h"
 
 #include <signal.h>
 #include <stdlib.h>
 #include <sys/types.h>
 
@@ skipping 1028 matching lines @@
 }
 
 void WizardController::SetUsageStatisticsReporting(bool val) {
   usage_statistics_reporting_ = val;
 }
 
 bool WizardController::GetUsageStatisticsReporting() const {
   return usage_statistics_reporting_;
 }
 
+void WizardController::SetHostNetwork() {
+  if (!shark_controller_)
+    return;
+  NetworkScreen* network_screen = NetworkScreen::Get(this);
+  std::string onc_spec;
+  network_screen->GetConnectedWifiNetwork(&onc_spec);
+  if (!onc_spec.empty())
+    shark_controller_->SetHostNetwork(onc_spec);
+}
+
 void WizardController::SetHostConfiguration() {
-  if (shark_controller_) {
-    NetworkScreen* network_screen = NetworkScreen::Get(this);
-    shark_controller_->SetHostConfiguration(
-        true,  // Eula must be accepted before we get this far.
-        network_screen->GetApplicationLocale(), network_screen->GetTimezone(),
-        GetUsageStatisticsReporting(), network_screen->GetInputMethod());
-  }
+  if (!shark_controller_)
+    return;
+  NetworkScreen* network_screen = NetworkScreen::Get(this);
+  shark_controller_->SetHostConfiguration(
+      true,  // Eula must be accepted before we get this far.
+      network_screen->GetApplicationLocale(), network_screen->GetTimezone(),
+      GetUsageStatisticsReporting(), network_screen->GetInputMethod());
 }
 
 void WizardController::ConfigureHostRequested(
     bool accepted_eula,
     const std::string& lang,
     const std::string& timezone,
     bool send_reports,
     const std::string& keyboard_layout) {
   VLOG(1) << "ConfigureHost locale=" << lang << ", timezone=" << timezone
           << ", keyboard_layout=" << keyboard_layout;
   if (accepted_eula)  // Always true.
     StartupUtils::MarkEulaAccepted();
   SetUsageStatisticsReporting(send_reports);
 
   NetworkScreen* network_screen = NetworkScreen::Get(this);
   network_screen->SetApplicationLocale(lang);
   network_screen->SetTimezone(timezone);
   network_screen->SetInputMethod(keyboard_layout);
 }
 
 void WizardController::AddNetworkRequested(const std::string& onc_spec) {
   NetworkScreen* network_screen = NetworkScreen::Get(this);
-  network_screen->CreateNetworkFromOnc(onc_spec);
+  network_screen->CreateAndConnectNetworkFromOnc(onc_spec);
 }
 
 void WizardController::OnEnableDebuggingScreenRequested() {
   if (!login_screen_started())
     AdvanceToScreen(WizardController::kEnableDebuggingScreenName);
 }
 
 void WizardController::OnAccessibilityStatusChanged(
     const AccessibilityStatusEventDetails& details) {
   enum AccessibilityNotificationType type = details.notification_type;
@@ skipping 227 matching lines @@
   }
 
   EnrollmentScreen* screen = EnrollmentScreen::Get(this);
   screen->SetParameters(effective_config, shark_controller_.get(),
                         remora_controller_.get());
   SetStatusAreaVisible(true);
   SetCurrentScreen(screen);
 }
 
 }  // namespace chromeos