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

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

Issue 368233004: ONC: Cleanup client certificate related fields. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix compilation on Win/Mac. Created 6 years, 5 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
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/bind.h" 8 #include "base/bind.h"
9 #include "base/strings/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
(...skipping 890 matching lines...) Expand 10 before | Expand all | Expand 10 after
901 show_8021x = true; 901 show_8021x = true;
902 } else if (network->type() == shill::kTypeEthernet) { 902 } else if (network->type() == shill::kTypeEthernet) {
903 show_8021x = true; 903 show_8021x = true;
904 } else { 904 } else {
905 NOTREACHED() << "Unexpected network type for WifiConfigView: " 905 NOTREACHED() << "Unexpected network type for WifiConfigView: "
906 << network->type() << " Path: " << service_path_; 906 << network->type() << " Path: " << service_path_;
907 } 907 }
908 ParseEAPUIProperty(&eap_method_ui_data_, network, ::onc::eap::kOuter); 908 ParseEAPUIProperty(&eap_method_ui_data_, network, ::onc::eap::kOuter);
909 ParseEAPUIProperty(&phase_2_auth_ui_data_, network, ::onc::eap::kInner); 909 ParseEAPUIProperty(&phase_2_auth_ui_data_, network, ::onc::eap::kInner);
910 ParseEAPUIProperty( 910 ParseEAPUIProperty(
911 &user_cert_ui_data_, network, ::onc::eap::kClientCertRef); 911 &user_cert_ui_data_, network, ::onc::client_cert::kClientCertRef);
912 ParseEAPUIProperty( 912 ParseEAPUIProperty(
913 &server_ca_cert_ui_data_, network, ::onc::eap::kServerCARef); 913 &server_ca_cert_ui_data_, network, ::onc::eap::kServerCARef);
914 if (server_ca_cert_ui_data_.IsManaged()) { 914 if (server_ca_cert_ui_data_.IsManaged()) {
915 ParseEAPUIProperty( 915 ParseEAPUIProperty(
916 &server_ca_cert_ui_data_, network, ::onc::eap::kUseSystemCAs); 916 &server_ca_cert_ui_data_, network, ::onc::eap::kUseSystemCAs);
917 } 917 }
918 ParseEAPUIProperty(&identity_ui_data_, network, ::onc::eap::kIdentity); 918 ParseEAPUIProperty(&identity_ui_data_, network, ::onc::eap::kIdentity);
919 ParseEAPUIProperty( 919 ParseEAPUIProperty(
920 &identity_anonymous_ui_data_, network, ::onc::eap::kAnonymousIdentity); 920 &identity_anonymous_ui_data_, network, ::onc::eap::kAnonymousIdentity);
921 ParseEAPUIProperty( 921 ParseEAPUIProperty(
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
1374 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data, 1374 void WifiConfigView::ParseEAPUIProperty(NetworkPropertyUIData* property_ui_data,
1375 const NetworkState* network, 1375 const NetworkState* network,
1376 const std::string& key) { 1376 const std::string& key) {
1377 std::string onc_tag = network->type() == shill::kTypeEthernet 1377 std::string onc_tag = network->type() == shill::kTypeEthernet
1378 ? ::onc::ethernet::kEAP 1378 ? ::onc::ethernet::kEAP
1379 : ::onc::wifi::kEAP; 1379 : ::onc::wifi::kEAP;
1380 ParseUIProperty(property_ui_data, network, onc_tag + '.' + key); 1380 ParseUIProperty(property_ui_data, network, onc_tag + '.' + key);
1381 } 1381 }
1382 1382
1383 } // namespace chromeos 1383 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/options/vpn_config_view.cc ('k') | chrome/browser/local_discovery/wifi/wifi_manager_nonchromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698