Use correct slot id for client certs in network config.

chrome/browser/chromeos/options/vpn_config_view.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_OPTIONS_VPN_CONFIG_VIEW_H_
 #define CHROME_BROWSER_CHROMEOS_OPTIONS_VPN_CONFIG_VIEW_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/chromeos/options/cert_library.h"
 #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"
 #include "ui/views/view.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace views {
@@ skipping 50 matching lines @@
   // Initializes data members and create UI controls.
   void Init();
 
   // Callback to initialize fields from uncached network properties.
   void InitFromProperties(const std::string& service_path,
                           const base::DictionaryValue& dictionary);
   void ParseUIProperties(const NetworkState* vpn);
   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);
 
   // Set and update all control values.
   void Refresh();
 
   // Update various controls.
   void UpdateControlsToEnable();
   void UpdateControls();
   void UpdateErrorLabel();
@@ skipping 17 matching lines @@
 
   // Convenience methods to get text from input field or cached VirtualNetwork.
   const std::string GetService() const;
   const std::string GetServer() const;
   const std::string GetPSKPassphrase() const;
   const std::string GetUsername() const;
   const std::string GetUserPassphrase() const;
   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;
 
   // Parses a VPN UI |property| from the given |network|. |key| is the property
   // name within the type-specific VPN subdictionary named |dict_key|.
   void ParseVPNUIProperty(const NetworkState* network,
                           const std::string& dict_key,
                           const std::string& key,
                           NetworkPropertyUIData* property_ui_data);
@@ skipping 50 matching lines @@
   std::string client_cert_id_;
 
   base::WeakPtrFactory<VPNConfigView> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VPNConfigView);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_OPTIONS_VPN_CONFIG_VIEW_H_