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

chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.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_UI_CONTROLLER_H_
 #define CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_BUBBLE_UI_CONTROLLER_H_
 
 #include "components/password_manager/core/browser/password_form_manager.h"
 #include "components/password_manager/core/browser/password_store.h"
 #include "components/password_manager/core/browser/password_store_change.h"
@@ skipping 20 matching lines @@
   // This stores the provided object in form_manager_ and triggers the UI to
   // prompt the user about whether they would like to save the password.
   void OnPasswordSubmitted(password_manager::PasswordFormManager* form_manager);
 
   // 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.
   void OnPasswordAutofilled(const autofill::PasswordFormMap& password_form_map);
 
-  // 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 |password_form_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);
 
   // PasswordStore::Observer implementation.
   virtual void OnLoginsChanged(
       const password_manager::PasswordStoreChangeList& changes) OVERRIDE;
 
   // Called from the model when the user chooses to save a password; passes the
   // action off to the FormManager.
   virtual void SavePassword();
 
   // Called from the model when the user chooses to never save passwords; passes
   // 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();
 
   virtual const autofill::PasswordForm& PendingCredentials() const;
 
   // Set the state of the Omnibox icon, and possibly show the associated bubble
   // without user interaction.
   virtual void UpdateIconAndBubbleState(ManagePasswordsIcon* icon);
 
   bool manage_passwords_icon_to_be_shown() const {
@@ skipping 20 matching lines @@
   void set_autofill_blocked(bool autofill_blocked) {
     autofill_blocked_ = autofill_blocked;
   }
 
   const GURL& origin() const { return origin_; }
 
  protected:
   explicit ManagePasswordsBubbleUIController(
       content::WebContents* web_contents);
 
+  // All previously stored credentials for a specific site. Set by
+  // OnPasswordSubmitted(), OnPasswordAutofilled(), or
+  // OnBlacklistBlockedAutofill(). Protected, not private, so we can mess with
+  // the value in ManagePasswordsBubbleUIControllerMock.
+  autofill::PasswordFormMap password_form_map_;
+
  private:
   friend class content::WebContentsUserData<ManagePasswordsBubbleUIController>;
 
   // Called when a passwordform is autofilled, when a new passwordform is
   // submitted, or when a navigation occurs to update the visibility of the
   // manage passwords icon and bubble.
   void UpdateBubbleAndIconVisibility();
 
   // content::WebContentsObserver:
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
       const content::FrameNavigateParams& params) OVERRIDE;
   virtual void WebContentsDestroyed(
       content::WebContents* web_contents) OVERRIDE;
 
   // Set by OnPasswordSubmitted() when the user submits a form containing login
   // information.  If the user responds to a subsequent "Do you want to save
   // this password?" prompt, we ask this object to save or blacklist the
   // associated login information in Chrome's password store.
   scoped_ptr<password_manager::PasswordFormManager> form_manager_;
 
-  // All previously stored credentials for a specific site.  Set by
-  // OnPasswordSubmitted() or OnPasswordAutofilled().
-  autofill::PasswordFormMap password_form_map_;
-
   bool manage_passwords_icon_to_be_shown_;
   bool password_to_be_saved_;
   bool manage_passwords_bubble_needs_showing_;
 
   // Stores whether autofill was blocked due to a user's decision to blacklist
   // the current site ("Never save passwords for this site").
   bool autofill_blocked_;
 
   // The origin of the form we're currently dealing with; we'll use this to
   // determine which PasswordStore changes we should care about when updating
   // |password_form_map_|.
   GURL origin_;
 
   DISALLOW_COPY_AND_ASSIGN(ManagePasswordsBubbleUIController);
 };
 
 #endif  // CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_BUBBLE_UI_CONTROLLER_H_