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

Side by Side Diff: chrome/browser/chromeos/options/vpn_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/vpn_config_view.h" 5 #include "chrome/browser/chromeos/options/vpn_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 764 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 ParseVPNUIProperty(vpn, type_dict_name, ::onc::ipsec::kServerCARef, 775 ParseVPNUIProperty(vpn, type_dict_name, ::onc::ipsec::kServerCARef,
776 &ca_cert_ui_data_); 776 &ca_cert_ui_data_);
777 ParseVPNUIProperty(vpn, type_dict_name, ::onc::ipsec::kPSK, 777 ParseVPNUIProperty(vpn, type_dict_name, ::onc::ipsec::kPSK,
778 &psk_passphrase_ui_data_); 778 &psk_passphrase_ui_data_);
779 ParseVPNUIProperty(vpn, type_dict_name, ::onc::ipsec::kGroup, 779 ParseVPNUIProperty(vpn, type_dict_name, ::onc::ipsec::kGroup,
780 &group_name_ui_data_); 780 &group_name_ui_data_);
781 } else if (provider_type_index_ == PROVIDER_TYPE_INDEX_OPEN_VPN) { 781 } else if (provider_type_index_ == PROVIDER_TYPE_INDEX_OPEN_VPN) {
782 ParseVPNUIProperty(vpn, type_dict_name, ::onc::openvpn::kServerCARef, 782 ParseVPNUIProperty(vpn, type_dict_name, ::onc::openvpn::kServerCARef,
783 &ca_cert_ui_data_); 783 &ca_cert_ui_data_);
784 } 784 }
785 ParseVPNUIProperty(vpn, type_dict_name, ::onc::vpn::kClientCertRef, 785 ParseVPNUIProperty(vpn, type_dict_name, ::onc::client_cert::kClientCertRef,
786 &user_cert_ui_data_); 786 &user_cert_ui_data_);
787 787
788 const std::string credentials_dict_name( 788 const std::string credentials_dict_name(
789 provider_type_index_ == PROVIDER_TYPE_INDEX_L2TP_IPSEC_PSK ? 789 provider_type_index_ == PROVIDER_TYPE_INDEX_L2TP_IPSEC_PSK ?
790 ::onc::vpn::kL2TP : type_dict_name); 790 ::onc::vpn::kL2TP : type_dict_name);
791 ParseVPNUIProperty(vpn, credentials_dict_name, ::onc::vpn::kUsername, 791 ParseVPNUIProperty(vpn, credentials_dict_name, ::onc::vpn::kUsername,
792 &username_ui_data_); 792 &username_ui_data_);
793 ParseVPNUIProperty(vpn, credentials_dict_name, ::onc::vpn::kPassword, 793 ParseVPNUIProperty(vpn, credentials_dict_name, ::onc::vpn::kPassword,
794 &user_passphrase_ui_data_); 794 &user_passphrase_ui_data_);
795 ParseVPNUIProperty(vpn, credentials_dict_name, ::onc::vpn::kSaveCredentials, 795 ParseVPNUIProperty(vpn, credentials_dict_name, ::onc::vpn::kSaveCredentials,
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
1060 property_ui_data->ParseOncProperty( 1060 property_ui_data->ParseOncProperty(
1061 onc_source, 1061 onc_source,
1062 onc, 1062 onc,
1063 base::StringPrintf("%s.%s.%s", 1063 base::StringPrintf("%s.%s.%s",
1064 ::onc::network_config::kVPN, 1064 ::onc::network_config::kVPN,
1065 dict_key.c_str(), 1065 dict_key.c_str(),
1066 key.c_str())); 1066 key.c_str()));
1067 } 1067 }
1068 1068
1069 } // namespace chromeos 1069 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/net/onc_utils.cc ('k') | chrome/browser/chromeos/options/wifi_config_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698