Password bubble: Give users the option of unblacklisting a site.

chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h

Index: chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h
diff --git a/chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h b/chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h
index f99dca426b8a25f9d734d811b82d81c5ba3a8330..73874eb9652c8ac5b019e8398e613ac339004374 100644
--- a/chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h
+++ b/chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h
@@ -34,12 +34,14 @@ class ManagePasswordsBubbleUIController
 
   // Called when a form is autofilled with login information, so we can manage
   // password credentials for the current site which are stored in
-  // |password_form_map|. This stores a copy of |password_form_map| and shows
-  // the manage password icon.
+  // |map|. This stores a copy of |map| and shows the manage password icon.
   void OnPasswordAutofilled(const autofill::PasswordFormMap& password_form_map);

[vabr (Chromium), 2014/04/29 13:30:12]

nit: Match the argument name (|map|) with the comment above.

[Mike West, 2014/04/30 10:39:32]

Done.

 
-  // Called when a form is _not_ autofilled due to user blacklisting.
-  void OnBlacklistBlockedAutofill();
+  // Called when a form is _not_ autofilled due to user blacklisting. This
+  // stores a copy of |map| so that we can offer the user the ability to
+  // reenable the manager for this form.
+  void OnBlacklistBlockedAutofill(
+      const autofill::PasswordFormMap& password_form_map);

[vabr (Chromium), 2014/04/29 13:30:12]

ditto (argument name vs. comment)

[Mike West, 2014/04/30 10:39:32]

Done.

 
   // PasswordStore::Observer implementation.
   virtual void OnLoginsChanged(
@@ -53,6 +55,9 @@ class ManagePasswordsBubbleUIController
   // the action off to the FormManager.
   virtual void NeverSavePassword();
 
+  // Called from the model when the user chooses to unblacklist the site.
+  virtual void UnblacklistSite();
+
   // Open a new tab, pointing to the password manager settings page.
   virtual void NavigateToPasswordManagerSettingsPage();
 
@@ -115,7 +120,8 @@ class ManagePasswordsBubbleUIController
   scoped_ptr<password_manager::PasswordFormManager> form_manager_;
 
   // All previously stored credentials for a specific site.  Set by
-  // OnPasswordSubmitted() or OnPasswordAutofilled().
+  // OnPasswordSubmitted(), OnPasswordAutofilled(), or
+  // OnBlacklistBlockedAutofill().
   autofill::PasswordFormMap password_form_map_;
 
   bool manage_passwords_icon_to_be_shown_;