2nd attempt to land http://codereview.chromium.org/1676002 for njw...

chrome/browser/chromeos/options/network_config_view.cc

 // Copyright (c) 2009 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_config_view.h"
 
 #include "app/l10n_util.h"
 #include "base/string_util.h"
-#include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/options/ip_config_view.h"
 #include "chrome/browser/chromeos/options/wifi_config_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/grid_layout.h"
 #include "views/standard_layout.h"
 #include "views/window/window.h"
 
 namespace chromeos {
@@ skipping 46 matching lines @@
   if (flags_ & FLAG_LOGIN_ONLY && button == MessageBoxFlags::DIALOGBUTTON_OK)
     return wificonfig_view_->can_login();
   return true;
 }
 
 bool NetworkConfigView::Cancel() {
   return true;
 }
 
 bool NetworkConfigView::Accept() {
-  if (flags_ & FLAG_LOGIN_ONLY) {
-    if (flags_ & FLAG_OTHER_NETWORK) {
-      CrosLibrary::Get()->GetNetworkLibrary()->ConnectToWifiNetwork(
-          wificonfig_view_->GetSSID(), wificonfig_view_->GetPassphrase());
-    } else {
-      CrosLibrary::Get()->GetNetworkLibrary()->ConnectToWifiNetwork(wifi_,
-          wificonfig_view_->GetPassphrase());
-    }
-  } else {
-    // TODO(chocobo): Save new ip config data and/or save new passphrase.
-  }
+  if (flags_ & FLAG_WIFI)
+    return wificonfig_view_->Accept();
   return true;
 }
 
 std::wstring NetworkConfigView::GetWindowTitle() const {
   if (flags_ & FLAG_OTHER_NETWORK)
     return l10n_util::GetString(IDS_OPTIONS_SETTINGS_OTHER_NETWORKS);
   if (flags_ & FLAG_WIFI)
     return ASCIIToWide(wifi_.ssid);
   if (flags_ & FLAG_CELLULAR)
     return ASCIIToWide(cellular_.name);
@@ skipping 49 matching lines @@
       ipconfig_view_ = new IPConfigView(cellular_.device_path);
     else
       ipconfig_view_ = new IPConfigView(ethernet_.device_path);
     tabs_->AddTab(
         l10n_util::GetString(IDS_OPTIONS_SETTINGS_SECTION_TITLE_IP_CONFIG),
         ipconfig_view_);
   }
 }
 
 }  // namespace chromeos