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

Side by Side Diff: chrome/browser/chromeos/options/wifi_config_view.cc

Issue 23872021: Use Name not SSID in CopyIdentifyingProperties (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 3 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chromeos/network/network_connection_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/options/wifi_config_view.h" 5 #include "chrome/browser/chromeos/options/wifi_config_view.h"
6 6
7 #include "ash/system/chromeos/network/network_connect.h" 7 #include "ash/system/chromeos/network/network_connect.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 1231 matching lines...) Expand 10 before | Expand all | Expand 10 after
1242 server_ca_cert_combobox_->SetSelectedIndex( 1242 server_ca_cert_combobox_->SetSelectedIndex(
1243 server_ca_cert_combobox_->model()->GetItemCount() - 1); 1243 server_ca_cert_combobox_->model()->GetItemCount() - 1);
1244 } 1244 }
1245 } else { 1245 } else {
1246 // Select the certificate if available. 1246 // Select the certificate if available.
1247 int cert_index = CertLibrary::Get()->GetCertIndexByPEM( 1247 int cert_index = CertLibrary::Get()->GetCertIndexByPEM(
1248 CertLibrary::CERT_TYPE_SERVER_CA, eap_ca_cert_pem); 1248 CertLibrary::CERT_TYPE_SERVER_CA, eap_ca_cert_pem);
1249 if (cert_index >= 0) { 1249 if (cert_index >= 0) {
1250 // Skip item for "Default". 1250 // Skip item for "Default".
1251 server_ca_cert_combobox_->SetSelectedIndex(1 + cert_index); 1251 server_ca_cert_combobox_->SetSelectedIndex(1 + cert_index);
1252 } else {
1253 // "Default"
1254 server_ca_cert_combobox_->SetSelectedIndex(0);
1252 } 1255 }
1253 } 1256 }
1254 } 1257 }
1255 1258
1256 // User certificate. 1259 // User certificate.
1257 if (UserCertActive()) { 1260 if (UserCertActive()) {
1258 std::string eap_cert_id; 1261 std::string eap_cert_id;
1259 properties.GetStringWithoutPathExpansion( 1262 properties.GetStringWithoutPathExpansion(
1260 flimflam::kEapCertIdProperty, &eap_cert_id); 1263 flimflam::kEapCertIdProperty, &eap_cert_id);
1261 if (!eap_cert_id.empty()) { 1264 if (!eap_cert_id.empty()) {
(...skipping 23 matching lines...) Expand all
1285 flimflam::kConnectableProperty, &connectable); 1288 flimflam::kConnectableProperty, &connectable);
1286 passphrase_textfield_->SetShowFake(connectable); 1289 passphrase_textfield_->SetShowFake(connectable);
1287 } 1290 }
1288 1291
1289 // Save credentials 1292 // Save credentials
1290 bool save_credentials = false; 1293 bool save_credentials = false;
1291 properties.GetBooleanWithoutPathExpansion( 1294 properties.GetBooleanWithoutPathExpansion(
1292 flimflam::kSaveCredentialsProperty, &save_credentials); 1295 flimflam::kSaveCredentialsProperty, &save_credentials);
1293 save_credentials_checkbox_->SetChecked(save_credentials); 1296 save_credentials_checkbox_->SetChecked(save_credentials);
1294 1297
1298 UpdateDialogButtons();
1295 RefreshShareCheckbox(); 1299 RefreshShareCheckbox();
1296 UpdateErrorLabel(); 1300 UpdateErrorLabel();
1297 } 1301 }
1298 1302
1299 void WifiConfigView::InitFocus() { 1303 void WifiConfigView::InitFocus() {
1300 views::View* view_to_focus = GetInitiallyFocusedView(); 1304 views::View* view_to_focus = GetInitiallyFocusedView();
1301 if (view_to_focus) 1305 if (view_to_focus)
1302 view_to_focus->RequestFocus(); 1306 view_to_focus->RequestFocus();
1303 } 1307 }
1304 1308
(...skipping 22 matching lines...) Expand all
1327 void WifiConfigView::ParseWiFiEAPUIProperty( 1331 void WifiConfigView::ParseWiFiEAPUIProperty(
1328 NetworkPropertyUIData* property_ui_data, 1332 NetworkPropertyUIData* property_ui_data,
1329 const NetworkState* network, 1333 const NetworkState* network,
1330 const std::string& key) { 1334 const std::string& key) {
1331 ParseWiFiUIProperty( 1335 ParseWiFiUIProperty(
1332 property_ui_data, network, 1336 property_ui_data, network,
1333 base::StringPrintf("%s.%s", onc::wifi::kEAP, key.c_str())); 1337 base::StringPrintf("%s.%s", onc::wifi::kEAP, key.c_str()));
1334 } 1338 }
1335 1339
1336 } // namespace chromeos 1340 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chromeos/network/network_connection_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698