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

Unified Diff: chrome/browser/chromeos/options/vpn_config_view.h

Issue 421113002: Use correct slot id for client certs in network config. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/options/vpn_config_view.h
diff --git a/chrome/browser/chromeos/options/vpn_config_view.h b/chrome/browser/chromeos/options/vpn_config_view.h
index 3bb21a6cb66ef80ba374e806f808d13aba284154..a0baeb973c852411c9beddef7290b02da3b65b14 100644
--- a/chrome/browser/chromeos/options/vpn_config_view.h
+++ b/chrome/browser/chromeos/options/vpn_config_view.h
@@ -13,6 +13,7 @@
#include "chrome/browser/chromeos/options/network_config_view.h"
#include "chrome/browser/chromeos/options/network_property_ui_data.h"
#include "chrome/browser/chromeos/options/passphrase_textfield.h"
+#include "chromeos/network/client_cert_util.h"
#include "ui/views/controls/button/button.h"
#include "ui/views/controls/combobox/combobox_listener.h"
#include "ui/views/controls/textfield/textfield_controller.h"
@@ -83,6 +84,11 @@ class VPNConfigView : public ChildNetworkConfigView,
void GetPropertiesError(const std::string& error_name,
scoped_ptr<base::DictionaryValue> error_data);
+ // Fill in |properties| with the properties for the selected client (user)
+ // certificate or empty properties if no client cert is required.
+ void SetUserCertProperties(chromeos::client_cert::ConfigType client_cert_type,
+ base::DictionaryValue* properties) const;
+
// Helper function to set configurable properties.
void SetConfigProperties(base::DictionaryValue* properties);
@@ -120,7 +126,6 @@ class VPNConfigView : public ChildNetworkConfigView,
const std::string GetOTP() const;
const std::string GetGroupName() const;
const std::string GetServerCACertPEM() const;
- const std::string GetUserCertID() const;
bool GetSaveCredentials() const;
int GetProviderTypeIndex() const;
std::string GetProviderTypeString() const;

Powered by Google App Engine
This is Rietveld 408576698