Refactoring Manage Passwords Bubble Code to exclude TabSpecificContentSettings

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/views/controls/button/button.h"
@@ skipping 69 matching lines @@
                   -1, button_height);
   if (manage_passwords_bubble_model_->manage_passwords_bubble_state() !=
       ManagePasswordsBubbleModel::PASSWORD_TO_BE_SAVED) {
     layout->AddView(delete_or_undo_button_);
   }
 }
 
 // static
 string16 ManagePasswordItemView::GetPasswordDisplayString(
     const string16& password) {
-  const wchar_t password_bullet = 0x2022;
-  const size_t max_password_char = 22;
-  return string16(std::min(password.length(), max_password_char),
-                  password_bullet);
+  const wchar_t kPasswordBullet = 0x2022;
+  const size_t kMaxPasswordChar = 22;
+  return string16(std::min(password.length(), kMaxPasswordChar),
+                  kPasswordBullet);
 }
 
 ManagePasswordItemView::~ManagePasswordItemView() {
   if (delete_password_)
     manage_passwords_bubble_model_->DeleteFromBestMatches(password_form_);
 }
 
 void ManagePasswordItemView::Refresh() {
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
   if (delete_password_) {
     label_1_->SetText(l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_DELETED));
     label_2_->SetText(l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_UNDO));
     label_2_->SetHorizontalAlignment(gfx::ALIGN_RIGHT);
     delete_or_undo_button_->SetImage(
         views::Button::STATE_NORMAL,
         *rb->GetImageSkiaNamed(IDR_PASSWORD_UNDO_ARROW));
-    manage_passwords_bubble_model_->PasswordAction(password_form_, true);
+    manage_passwords_bubble_model_->OnPasswordAction(password_form_, true);
   } else {
     label_1_->SetText(password_form_.username_value);
     label_2_->SetText(GetPasswordDisplayString(password_form_.password_value));
     label_2_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     delete_or_undo_button_->SetImage(views::Button::STATE_NORMAL,
                                      *rb->GetImageSkiaNamed(IDR_CLOSE_2));
-    manage_passwords_bubble_model_->PasswordAction(password_form_, false);
+    manage_passwords_bubble_model_->OnPasswordAction(password_form_, false);
   }
 }
 
 void ManagePasswordItemView::ButtonPressed(views::Button* sender,
                                            const ui::Event& event) {
   DCHECK_EQ(delete_or_undo_button_, sender);
   delete_password_ = !delete_password_;
   Refresh();
 }