Password bubble: Add a test for displayed password length.

chrome/browser/ui/views/passwords/manage_password_item_view.cc

 // Copyright 2013 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/ui/views/passwords/manage_password_item_view.h"
 
 #include "grit/generated_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 37 matching lines @@
   layout->StartRowWithPadding(
       0, column_set_to_build, 0, views::kRelatedControlVerticalSpacing);
 
   // Add the username field: fills the first non-padding column of the layout.
   label_1_ = new views::Label(password_form_.username_value);
   label_1_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   layout->AddView(label_1_);
 
   // Add the password field: fills the second non-padding column of the layout.
   label_2_ =
-      new views::Link(GetPasswordDisplayString(password_form_.password_value));
+      new views::Link(password_form_.password_value);
   label_2_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   label_2_->set_listener(this);
+  label_2_->SetObscured(true);
   label_2_->SetFocusable(false);
   label_2_->SetEnabled(false);
   label_2_->SetUnderline(false);
   layout->AddView(label_2_);
 
   // If we're managing passwords (that is, we're not currently in the process
   // of saving a password), construct and add the delete button: fills the
   // third non-padding column of the layout.
   if (!manage_passwords_bubble_model_->WaitingToSavePassword()) {
     delete_button_ = new views::ImageButton(this);
@@ skipping 37 matching lines @@
     column_set->AddColumn(views::GridLayout::TRAILING,
                           views::GridLayout::FILL,
                           0,
                           views::GridLayout::USE_PREF,
                           0,
                           0);
   }
   column_set->AddPaddingColumn(0, views::kItemLabelSpacing);
 }
 
-// static
-base::string16 ManagePasswordItemView::GetPasswordDisplayString(
-    const base::string16& password) {
-  const wchar_t kPasswordBullet = 0x2022;
-  const size_t kMaxPasswordChar = 22;
-  return base::string16(std::min(password.length(), kMaxPasswordChar),
-                  kPasswordBullet);
-}
-
 ManagePasswordItemView::~ManagePasswordItemView() {
   if (delete_password_)
     manage_passwords_bubble_model_->DeleteFromBestMatches(password_form_);
 }
 
 void ManagePasswordItemView::Refresh() {
   // TODO(mkwst): We're currently swaping out values in the same view. We need
   // to swap out views in order to enable some future work (and to make the undo
   // button's alignment work correctly).
 
   if (delete_password_) {
     // The user clicked the "delete password" button, so:
     //
     // Change the username string to "Deleted"
     label_1_->SetText(l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_DELETED));
 
     // Change the password's text to "Undo", and enable the link.
     label_2_->SetText(l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_UNDO));
     label_2_->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
+    label_2_->SetObscured(false);
     label_2_->SetEnabled(true);
     label_2_->SetFocusable(true);
 
     if (delete_button_)
       delete_button_->SetVisible(false);
   } else {
     // The user clicked the "undo" button after deleting a password, so:
 
     // Move focus to the parent in order to get the focus ring off the link
     // that the user just clicked.
     parent()->RequestFocus();
 
     // Change the username string back to the username.
     label_1_->SetText(password_form_.username_value);
 
-    // Set the password string to the appropriate number of bullets, and
+    // Change the second column back to the password, obscure and disable it.
     // disable the link.
-    label_2_->SetText(GetPasswordDisplayString(password_form_.password_value));
-    label_2_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+    label_2_->SetObscured(true);
     label_2_->SetEnabled(false);
     label_2_->SetFocusable(false);
+    label_2_->SetText(password_form_.password_value);
+    label_2_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
 
     if (delete_button_)
       delete_button_->SetVisible(true);
   }
 
   // After the view is consistent, notify the model that the password needs to
   // be updated (either removed or put back into the store, as appropriate.
   manage_passwords_bubble_model_->OnPasswordAction(
       password_form_,
       delete_password_ ? ManagePasswordsBubbleModel::REMOVE_PASSWORD
                        : ManagePasswordsBubbleModel::ADD_PASSWORD);
 }
 
 void ManagePasswordItemView::ButtonPressed(views::Button* sender,
                                            const ui::Event& event) {
   DCHECK_EQ(delete_button_, sender);
   delete_password_ = true;
   Refresh();
 }
 
 void ManagePasswordItemView::LinkClicked(views::Link* source,
                                          int event_flags) {
   DCHECK_EQ(source, label_2_);
   delete_password_ = false;
   Refresh();
 }