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

chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.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/passwords/manage_passwords_bubble_ui_controller.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 62 matching lines @@
     const PasswordFormMap& password_form_map) {
   password_form_map_ = password_form_map;
   origin_ = password_form_map_.begin()->second->origin;
   manage_passwords_icon_to_be_shown_ = true;
   password_to_be_saved_ = false;
   manage_passwords_bubble_needs_showing_ = false;
   autofill_blocked_ = false;
   UpdateBubbleAndIconVisibility();
 }
 
-void ManagePasswordsBubbleUIController::OnBlacklistBlockedAutofill() {
+void ManagePasswordsBubbleUIController::OnBlacklistBlockedAutofill(
+    const PasswordFormMap& password_form_map) {
+  password_form_map_ = password_form_map;
+  origin_ = password_form_map_.begin()->second->origin;
   manage_passwords_icon_to_be_shown_ = true;
   password_to_be_saved_ = false;
   manage_passwords_bubble_needs_showing_ = false;
   autofill_blocked_ = true;
   UpdateBubbleAndIconVisibility();
 }
 
 void ManagePasswordsBubbleUIController::WebContentsDestroyed(
     content::WebContents* web_contents) {
   password_manager::PasswordStore* password_store =
@@ skipping 29 matching lines @@
 #if !defined(OS_ANDROID)
   chrome::ShowSettingsSubPage(
       chrome::FindBrowserWithWebContents(web_contents()),
       chrome::kPasswordManagerSubPage);
 #endif
 }
 
 void ManagePasswordsBubbleUIController::SavePassword() {
   DCHECK(form_manager_.get());
   form_manager_->Save();
+  password_to_be_saved_ = false;
 }
 
 void ManagePasswordsBubbleUIController::NeverSavePassword() {
   DCHECK(form_manager_.get());
   form_manager_->PermanentlyBlacklist();
+  autofill_blocked_ = true;
+  password_to_be_saved_ = false;
+  UpdateBubbleAndIconVisibility();
+}
+
+void ManagePasswordsBubbleUIController::UnblacklistSite() {
+  // We're in one of two states: either the user _just_ blacklisted the site
+  // by clicking "Never save" in the pending bubble, or the user is visiting
+  // a blacklisted site.
+  //
+  // Either way, |password_form_map_| has been populated with the relevant
+  // form. We can safely pull it out, send it over to the password store
+  // for removal, and update our internal state.
+  DCHECK(!password_form_map_.empty());
+  password_manager::PasswordStore* password_store =
+      GetPasswordStore(web_contents());
+  if (password_store)
+    password_store->RemoveLogin(*password_form_map_.begin()->second);
+  autofill_blocked_ = false;
+  UpdateBubbleAndIconVisibility();
 }
 
 void ManagePasswordsBubbleUIController::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   if (details.is_in_page)
     return;
   // Reset password states for next page.
   manage_passwords_icon_to_be_shown_ = false;
   password_to_be_saved_ = false;
@@ skipping 21 matching lines @@
   icon->SetState(state);
 
   if (manage_passwords_bubble_needs_showing_) {
     DCHECK(state == ManagePasswordsIcon::PENDING_STATE);
     // TODO(mkwst): Replace this with execution of a browser command once we
     // can pipe a CommandUpdater down here.
     icon->ShowBubbleWithoutUserInteraction();
     manage_passwords_bubble_needs_showing_ = false;
   }
 }