Make text input type and password visibility bit independent in Textfield

chrome/browser/chromeos/options/wifi_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/wifi_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/cros/network_library.h"
@@ skipping 490 matching lines @@
       key_event.key_code() == ui::VKEY_RETURN) {
     parent_->GetDialogClientView()->AcceptWindow();
   }
   return false;
 }
 
 void WifiConfigView::ButtonPressed(views::Button* sender,
                                    const views::Event& event) {
   if (sender == passphrase_visible_button_) {
     if (passphrase_textfield_) {
-      passphrase_textfield_->SetPassword(!passphrase_textfield_->IsPassword());
-      passphrase_visible_button_->SetToggled(
-          !passphrase_textfield_->IsPassword());
+      bool obscure = !passphrase_textfield_->IsObscured();
+      passphrase_textfield_->SetObscured(obscure);
+      passphrase_visible_button_->SetToggled(!obscure);
     }
   } else {
     NOTREACHED();
   }
 }
 
 void WifiConfigView::ItemChanged(views::Combobox* combo_box,
                                  int prev_index, int new_index) {
   if (new_index == prev_index)
     return;
@@ skipping 378 matching lines @@
     layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
   }
 
   // Passphrase input
   layout->StartRow(0, column_view_set_id);
   int label_text_id = IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE;
   passphrase_label_ = new views::Label(
       l10n_util::GetStringUTF16(label_text_id));
   layout->AddView(passphrase_label_);
   passphrase_textfield_ = new views::Textfield(
-      views::Textfield::STYLE_PASSWORD);
+      views::Textfield::STYLE_OBSCURED);
   passphrase_textfield_->SetController(this);
   if (wifi && !wifi->GetPassphrase().empty())
     passphrase_textfield_->SetText(UTF8ToUTF16(wifi->GetPassphrase()));
   // Disable passphrase input initially for other network.
   if (!wifi) {
     passphrase_label_->SetEnabled(false);
     passphrase_textfield_->SetEnabled(false);
   }
   passphrase_textfield_->SetAccessibleName(l10n_util::GetStringUTF16(
       label_text_id));
@@ skipping 206 matching lines @@
   // Set focus to a reasonable widget, depending on what we're showing.
   if (ssid_textfield_)
     ssid_textfield_->RequestFocus();
   else if (eap_method_combobox_)
     eap_method_combobox_->RequestFocus();
   else if (passphrase_textfield_ && passphrase_textfield_->IsEnabled())
     passphrase_textfield_->RequestFocus();
 }
 
 }  // namespace chromeos