Refactoring Manage Passwords Bubble Code to exclude TabSpecificContentSettings

chrome/browser/ui/passwords/manage_passwords_bubble_model.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_BUBBLE_MODEL_H_
 #define CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_BUBBLE_MODEL_H_
 
-#include "chrome/browser/content_settings/tab_specific_content_settings.h"
+#include "components/autofill/core/common/password_form.h"
+#include "content/public/browser/web_contents_observer.h"
+
+class ManagePasswordsIconController;
+
+namespace autofill {
+class PasswordForm;
+}
 
 namespace content {
 class WebContents;
 }
 
 // This model provides data for the ManagePasswordsBubble and controls the
 // password management actions.
 class ManagePasswordsBubbleModel : public content::WebContentsObserver {
  public:
   explicit ManagePasswordsBubbleModel(content::WebContents* web_contents);
   virtual ~ManagePasswordsBubbleModel();
 
   enum ManagePasswordsBubbleState {
     PASSWORD_TO_BE_SAVED,
     MANAGE_PASSWORDS_AFTER_SAVING,
     MANAGE_PASSWORDS
   };
 
   // Called by the view code when the cancel button in clicked by the user.
   void OnCancelClicked();
 
   // Called by the view code when the save button in clicked by the user.
   void OnSaveClicked();
 
   // Called by the view code when the manage link is clicked by the user.
   void OnManageLinkClicked();
 
   // Called by the view code to delete or add a password form to the
   // PasswordStore.
-  void PasswordAction(autofill::PasswordForm password_form, bool remove);
+  void AddOrRemovePassword(autofill::PasswordForm password_form, bool remove);

[markusheintz_, 2013/11/26 12:44:37]

"Add" or "Remove" are two contradicting verbs that describe opposite actions.
This makes the method name very confusing and hard to understand. It is
discouraged to form method names like this. (There was a nice tot episode about
this, but a couldn't find it on go/tot so it's probably very old).

How about:
A) "OnPasswordAction"
B) "HandlePasswordAction"
C) "UpdatePassword"

as this seems to be a user input/ ui event handler.

[npentrel, 2013/11/26 14:25:55]

Done.

 
   // Called by the view code when the ManagePasswordItemView is destroyed and
   // the user chose to delete the password.
   // TODO(npentrel): Remove this once best_matches_ are newly made on bubble
   // opening.
   void DeleteFromBestMatches(autofill::PasswordForm password_form);
 
   ManagePasswordsBubbleState manage_passwords_bubble_state() {
     return manage_passwords_bubble_state_;
   }
 
   bool password_submitted() { return password_submitted_; }
+

[markusheintz_, 2013/11/26 12:44:37]

nit: remove this empty line

[npentrel, 2013/11/26 14:25:55]

Done.

   const string16& title() { return title_; }
   const autofill::PasswordForm& pending_credentials() {
     return pending_credentials_;
   }
   const autofill::PasswordFormMap& best_matches() { return best_matches_; }
   const string16& manage_link() { return manage_link_; }
 
  private:
   // content::WebContentsObserver
   virtual void WebContentsDestroyed(
       content::WebContents* web_contents) OVERRIDE;
 
   content::WebContents* web_contents_;
   ManagePasswordsBubbleState manage_passwords_bubble_state_;
   bool password_submitted_;
   string16 title_;
   autofill::PasswordForm pending_credentials_;
   autofill::PasswordFormMap best_matches_;
   string16 manage_link_;
 
   DISALLOW_COPY_AND_ASSIGN(ManagePasswordsBubbleModel);
 };
 
 #endif  // CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_BUBBLE_MODEL_H_