Revert 104076 - Change std::wstring to string16 for views::Link

chrome/browser/chromeos/options/vpn_config_view.cc

 // Copyright (c) 2011 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/vpn_config_view.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ skipping 69 matching lines @@
   virtual string16 GetItemAt(int combo_index) {
     if (!cert_library_->CertificatesLoaded())
       return l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
     if (combo_index == 0)
       return l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA_DEFAULT);
     int cert_index = combo_index - 1;
     return cert_library_->GetCACertificates().GetDisplayStringAt(cert_index);
   }
-
  private:
   CertLibrary* cert_library_;
   DISALLOW_COPY_AND_ASSIGN(ServerCACertComboboxModel);
 };
 
 class UserCertComboboxModel : public ui::ComboboxModel {
  public:
   explicit UserCertComboboxModel(CertLibrary* cert_library)
       : cert_library_(cert_library) {
   }
   virtual ~UserCertComboboxModel() {}
   virtual int GetItemCount() {
     if (!cert_library_->CertificatesLoaded())
       return 1;  // "Loading"
     int num_certs = cert_library_->GetUserCertificates().Size();
     if (num_certs == 0)
       return 1;  // "None installed"
     return num_certs;
   }
   virtual string16 GetItemAt(int combo_index) {
     if (!cert_library_->CertificatesLoaded())
       return l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_LOADING);
     if (cert_library_->GetUserCertificates().Size() == 0)
       return l10n_util::GetStringUTF16(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_USER_CERT_NONE_INSTALLED);
     return cert_library_->GetUserCertificates().GetDisplayStringAt(combo_index);
   }
-
  private:
   CertLibrary* cert_library_;
   DISALLOW_COPY_AND_ASSIGN(UserCertComboboxModel);
 };
 
 VPNConfigView::VPNConfigView(NetworkConfigView* parent, VirtualNetwork* vpn)
     : ChildNetworkConfigView(parent, vpn),
       cert_library_(NULL) {
   Init(vpn);
 }
@@ skipping 209 matching lines @@
 
 const std::string VPNConfigView::GetServerCACertNssNickname() const {
   DCHECK(server_ca_cert_combobox_);
   DCHECK(cert_library_);
   int selected = server_ca_cert_combobox_->selected_item();
   if (selected == 0) {
     // First item is "Default".
     return std::string();
   } else {
     DCHECK(cert_library_);
-    DCHECK_GT(cert_library_->GetCACertificates().Size(), 0);
+    DCHECK(cert_library_->GetCACertificates().Size() > 0);
     int cert_index = selected - 1;
     return cert_library_->GetCACertificates().GetNicknameAt(cert_index);
   }
 }
 
 const std::string VPNConfigView::GetUserCertID() const {
   DCHECK(user_cert_combobox_);
   DCHECK(cert_library_);
   if (!HaveUserCerts()) {
     return std::string();  // "None installed"
@@ skipping 26 matching lines @@
   column_set->AddPaddingColumn(0, views::kRelatedControlSmallHorizontalSpacing);
 
   // Initialize members.
   service_text_modified_ = false;
   provider_type_ = vpn ?
       vpn->provider_type() :
       chromeos::PROVIDER_TYPE_L2TP_IPSEC_PSK;
 
   // Server label and input.
   layout->StartRow(0, column_view_set_id);
-  layout->AddView(new views::Label(l10n_util::GetStringUTF16(
-      IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_SERVER_HOSTNAME)));
+  layout->AddView(new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_SERVER_HOSTNAME))));
   if (!vpn) {
     server_textfield_ = new views::Textfield(views::Textfield::STYLE_DEFAULT);
     server_textfield_->SetController(this);
     layout->AddView(server_textfield_);
     server_text_ = NULL;
   } else {
     server_hostname_ = vpn->server_hostname();
-    server_text_ = new views::Label(UTF8ToUTF16(server_hostname_));
+    server_text_ = new views::Label(UTF8ToWide(server_hostname_));
     server_text_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     layout->AddView(server_text_);
     server_textfield_ = NULL;
   }
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Service label and name or input.
   layout->StartRow(0, column_view_set_id);
-  layout->AddView(new views::Label(l10n_util::GetStringUTF16(
-      IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_SERVICE_NAME)));
+  layout->AddView(new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_SERVICE_NAME))));
   if (!vpn) {
     service_textfield_ = new views::Textfield(views::Textfield::STYLE_DEFAULT);
     service_textfield_->SetController(this);
     layout->AddView(service_textfield_);
     service_text_ = NULL;
   } else {
-    service_text_ = new views::Label(ASCIIToUTF16(vpn->name()));
+    service_text_ = new views::Label(ASCIIToWide(vpn->name()));
     service_text_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     layout->AddView(service_text_);
     service_textfield_ = NULL;
   }
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Provider type label and select.
   layout->StartRow(0, column_view_set_id);
-  layout->AddView(new views::Label(l10n_util::GetStringUTF16(
-      IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_PROVIDER_TYPE)));
+  layout->AddView(new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_PROVIDER_TYPE))));
   if (!vpn) {
     provider_type_combobox_ =
         new views::Combobox(new ProviderTypeComboboxModel());
     provider_type_combobox_->set_listener(this);
     layout->AddView(provider_type_combobox_);
     provider_type_text_label_ = NULL;
   } else {
     provider_type_text_label_ =
-        new views::Label(ProviderTypeToString(provider_type_));
+        new views::Label(UTF16ToWide(ProviderTypeToString(provider_type_)));
     provider_type_text_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     layout->AddView(provider_type_text_label_);
     provider_type_combobox_ = NULL;
   }
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // PSK passphrase label, input and visible button.
   layout->StartRow(0, column_view_set_id);
-  psk_passphrase_label_ =  new views::Label(l10n_util::GetStringUTF16(
-      IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_PSK_PASSPHRASE));
+  psk_passphrase_label_ =  new views::Label(UTF16ToWide(
+      l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_PSK_PASSPHRASE)));
   layout->AddView(psk_passphrase_label_);
   psk_passphrase_textfield_ = new views::Textfield(
       views::Textfield::STYLE_PASSWORD);
   psk_passphrase_textfield_->SetController(this);
   if (vpn && !vpn->psk_passphrase().empty())
     psk_passphrase_textfield_->SetText(UTF8ToUTF16(vpn->psk_passphrase()));
   layout->AddView(psk_passphrase_textfield_);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Server CA certificate
   layout->StartRow(0, column_view_set_id);
   server_ca_cert_label_ =
-      new views::Label(l10n_util::GetStringUTF16(
-          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA));
+      new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CERT_SERVER_CA)));
   layout->AddView(server_ca_cert_label_);
   ServerCACertComboboxModel* server_ca_cert_model =
       new ServerCACertComboboxModel(cert_library_);
   server_ca_cert_combobox_ = new views::Combobox(server_ca_cert_model);
   layout->AddView(server_ca_cert_combobox_);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // User certificate label and input.
   layout->StartRow(0, column_view_set_id);
-  user_cert_label_ = new views::Label(l10n_util::GetStringUTF16(
-      IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_USER_CERT));
+  user_cert_label_ = new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_USER_CERT)));
   layout->AddView(user_cert_label_);
   UserCertComboboxModel* user_cert_model =
       new UserCertComboboxModel(cert_library_);
   user_cert_combobox_ = new views::Combobox(user_cert_model);
   user_cert_combobox_->set_listener(this);
   layout->AddView(user_cert_combobox_);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Username label and input.
   layout->StartRow(0, column_view_set_id);
-  layout->AddView(new views::Label(l10n_util::GetStringUTF16(
-      IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_USERNAME)));
+  layout->AddView(new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_USERNAME))));
   username_textfield_ = new views::Textfield(views::Textfield::STYLE_DEFAULT);
   username_textfield_->SetController(this);
   if (vpn && !vpn->username().empty())
     username_textfield_->SetText(UTF8ToUTF16(vpn->username()));
   layout->AddView(username_textfield_);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // User passphrase label, input and visble button.
   layout->StartRow(0, column_view_set_id);
-  layout->AddView(new views::Label(l10n_util::GetStringUTF16(
-      IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_USER_PASSPHRASE)));
+  layout->AddView(new views::Label(UTF16ToWide(
+      l10n_util::GetStringUTF16(
+          IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_USER_PASSPHRASE))));
   user_passphrase_textfield_ = new views::Textfield(
       views::Textfield::STYLE_PASSWORD);
   user_passphrase_textfield_->SetController(this);
   if (vpn && !vpn->user_passphrase().empty())
     user_passphrase_textfield_->SetText(UTF8ToUTF16(vpn->user_passphrase()));
   layout->AddView(user_passphrase_textfield_);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // OTP label and input.
   layout->StartRow(0, column_view_set_id);
-  otp_label_ = new views::Label(l10n_util::GetStringUTF16(
-      IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_OTP));
+  otp_label_ = new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_OTP)));
   layout->AddView(otp_label_);
   otp_textfield_ = new views::Textfield(views::Textfield::STYLE_DEFAULT);
   otp_textfield_->SetController(this);
   layout->AddView(otp_textfield_);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // This is not currently implemented with no immediate plans to do so.
   // TODO(stevenjb,kmixter): Set true if we implement this.
   // See http://crosbug.com/19252.
   const bool show_group_name = false;
 
   // Group Name label and input.
   if (show_group_name) {
     layout->StartRow(0, column_view_set_id);
-    group_name_label_ = new views::Label(l10n_util::GetStringUTF16(
-        IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_GROUP_NAME));
+    group_name_label_ = new views::Label(UTF16ToWide(l10n_util::GetStringUTF16(
+        IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_GROUP_NAME)));
     layout->AddView(group_name_label_);
     group_name_textfield_ =
         new views::Textfield(views::Textfield::STYLE_DEFAULT);
     group_name_textfield_->SetController(this);
     if (vpn && !vpn->group_name().empty())
       group_name_textfield_->SetText(UTF8ToUTF16(vpn->group_name()));
     layout->AddView(group_name_textfield_);
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   } else {
     group_name_label_ = NULL;
@@ skipping 94 matching lines @@
 
   if (otp_label_)
     otp_label_->SetEnabled(enable_otp);
   if (otp_textfield_)
     otp_textfield_->SetEnabled(enable_otp);
 
   if (group_name_label_)
     group_name_label_->SetEnabled(enable_group_name);
   if (group_name_textfield_)
     group_name_textfield_->SetEnabled(enable_group_name);
+
 }
 
 void VPNConfigView::UpdateErrorLabel() {
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
 
   // Error message.
   std::string error_msg;
   if (UserCertRequired() && cert_library_->CertificatesLoaded()) {
     if (!HaveUserCerts()) {
       error_msg = l10n_util::GetStringUTF8(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PLEASE_INSTALL_USER_CERT);
     } else if (!IsUserCertValid()) {
       error_msg = l10n_util::GetStringUTF8(
           IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_REQUIRE_HARDWARE_BACKED);
     }
   }
   if (error_msg.empty() && !service_path_.empty()) {
     // TODO(kuan): differentiate between bad psk and user passphrases.
     VirtualNetwork* vpn = cros->FindVirtualNetworkByPath(service_path_);
     if (vpn && vpn->failed()) {
       if (vpn->error() == ERROR_BAD_PASSPHRASE) {
         error_msg = l10n_util::GetStringUTF8(
             IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_BAD_PASSPHRASE);
       } else {
         error_msg = vpn->GetErrorString();
       }
     }
   }
   if (!error_msg.empty()) {
-    error_label_->SetText(UTF8ToUTF16(error_msg));
+    error_label_->SetText(UTF8ToWide(error_msg));
     error_label_->SetVisible(true);
   } else {
     error_label_->SetVisible(false);
   }
 }
 
 void VPNConfigView::UpdateCanLogin() {
   parent_->GetDialogClientView()->UpdateDialogButtons();
 }
 
@@ skipping 25 matching lines @@
     return std::string();
   std::string untrimmed = UTF16ToUTF8(textfield->text());
   if (!trim_whitespace)
     return untrimmed;
   std::string result;
   TrimWhitespaceASCII(untrimmed, TRIM_ALL, &result);
   return result;
 }
 
 }  // namespace chromeos