Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(839)

Unified Diff: chrome/browser/chromeos/options/network_config_view.cc

Issue 1692005: 2nd attempt to land http://codereview.chromium.org/1676002 for njw... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/options/network_config_view.cc
===================================================================
--- chrome/browser/chromeos/options/network_config_view.cc (revision 45218)
+++ chrome/browser/chromeos/options/network_config_view.cc (working copy)
@@ -6,7 +6,6 @@
#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"
@@ -73,17 +72,8 @@
}
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;
}
« no previous file with comments | « chrome/browser/chromeos/options/internet_page_view.cc ('k') | chrome/browser/chromeos/options/wifi_config_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698