Implement action interface in network_menu.js for 'connect'.

chrome/browser/chromeos/options/wifi_config_view.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/chromeos/options/wifi_config_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 177 matching lines @@
 
 void WifiConfigView::FocusFirstField() {
   if (ssid_textfield_)
     ssid_textfield_->RequestFocus();
   else if (identity_textfield_)
     identity_textfield_->RequestFocus();
   else if (passphrase_textfield_)
     passphrase_textfield_->RequestFocus();
 }
 
-// Parse 'path' to determine if the certificate is stored in a pkcs#11 device.
-// flimflam recognizes the string "SETTINGS:" to specify authentication
-// parameters. 'key_id=' indicates that the certificate is stored in a pkcs#11
-// device. See src/third_party/flimflam/files/doc/service-api.txt.
-static bool is_certificate_in_pkcs11(const std::string& path) {
-  static const std::string settings_string("SETTINGS:");
-  static const std::string pkcs11_key("key_id");
-  if (path.find(settings_string) == 0) {
-    std::string::size_type idx = path.find(pkcs11_key);
-    if (idx != std::string::npos)
-      idx = path.find_first_not_of(kWhitespaceASCII, idx + pkcs11_key.length());
-    if (idx != std::string::npos && path[idx] == '=')
-      return true;
-  }
-  return false;
-}
-
 void WifiConfigView::Init() {
   views::GridLayout* layout = CreatePanelGridLayout(this);
   SetLayoutManager(layout);
 
   int column_view_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(column_view_set_id);
   // Label
   column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, 0);
   // Textfield
@@ skipping 10 matching lines @@
     ssid_textfield_ = new views::Textfield(views::Textfield::STYLE_DEFAULT);
     ssid_textfield_->SetController(this);
     layout->AddView(ssid_textfield_);
   } else {
     views::Label* label = new views::Label(ASCIIToWide(wifi_.name()));
     label->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     layout->AddView(label);
   }
   layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
 
-  // Certificates stored in a pkcs11 device can not be browsed
-  // and do not require a passphrase.
-  bool certificate_in_pkcs11 = false;
+  // Loaded certificates (i.e. stored in a pkcs11 device) do not require
+  // a passphrase.
+  bool certificate_loaded = false;
 
   // Add ID and cert password if we're using 802.1x
   // XXX we're cheating and assuming 802.1x means EAP-TLS - not true
   // in general, but very common. WPA Supplicant doesn't report the
   // EAP type because it's unknown until the process begins, and we'd
   // need some kind of callback.
   if (wifi_.encrypted() && wifi_.encryption() == SECURITY_8021X) {
     layout->StartRow(0, column_view_set_id);
     layout->AddView(new views::Label(l10n_util::GetString(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_IDENTITY)));
     identity_textfield_ = new views::Textfield(
         views::Textfield::STYLE_DEFAULT);
     identity_textfield_->SetController(this);
     if (!wifi_.identity().empty())
       identity_textfield_->SetText(UTF8ToUTF16(wifi_.identity()));
     layout->AddView(identity_textfield_);
     layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
     layout->StartRow(0, column_view_set_id);
     layout->AddView(new views::Label(l10n_util::GetString(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT)));
     if (!wifi_.cert_path().empty()) {
       certificate_path_ = wifi_.cert_path();
-      certificate_in_pkcs11 = is_certificate_in_pkcs11(certificate_path_);
+      certificate_loaded = wifi_.IsCertificateLoaded();
     }
-    if (certificate_in_pkcs11) {
+    if (certificate_loaded) {
       std::wstring label = l10n_util::GetString(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_INSTALLED);
       views::Label* cert_text = new views::Label(label);
       cert_text->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
       layout->AddView(cert_text);
     } else {
       std::wstring label;
       if (!certificate_path_.empty())
         label = UTF8ToWide(certificate_path_);
       else
         label = l10n_util::GetString(
             IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_BUTTON);
       certificate_browse_button_ = new views::NativeButton(this, label);
       layout->AddView(certificate_browse_button_);
     }
     layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   }
 
   // Add passphrase if other_network or wifi is encrypted.
-  if (other_network_ || (wifi_.encrypted() && !certificate_in_pkcs11)) {
+  if (other_network_ || (wifi_.encrypted() && !certificate_loaded)) {
     layout->StartRow(0, column_view_set_id);
     int label_text_id;
     if (wifi_.encryption() == SECURITY_8021X)
       label_text_id =
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PRIVATE_KEY_PASSWORD;
     else
       label_text_id = IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE;
     layout->AddView(new views::Label(l10n_util::GetString(label_text_id)));
     passphrase_textfield_ = new views::Textfield(
         views::Textfield::STYLE_PASSWORD);
@@ skipping 36 matching lines @@
     // For other network, default to autoconnect.
     bool autoconnect = other_network_ || wifi_.auto_connect();
     autoconnect_checkbox_->SetChecked(autoconnect);
     layout->StartRow(0, column_view_set_id);
     layout->AddView(autoconnect_checkbox_, 3, 1);
     layout->AddPaddingRow(0, kRelatedControlVerticalSpacing);
   }
 }
 
 }  // namespace chromeos