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

chrome/browser/ui/passwords/manage_passwords_bubble_model.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_model.h"
 
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h"
@@ skipping 11 matching lines @@
       display_disposition_(
           password_manager::metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING),
       dismissal_reason_(password_manager::metrics_util::NOT_DISPLAYED) {
   ManagePasswordsBubbleUIController* manage_passwords_bubble_ui_controller =
       ManagePasswordsBubbleUIController::FromWebContents(web_contents_);
 
   if (manage_passwords_bubble_ui_controller->password_to_be_saved()) {
     manage_passwords_bubble_state_ = PASSWORD_TO_BE_SAVED;
     pending_credentials_ =
         manage_passwords_bubble_ui_controller->PendingCredentials();
+  } else if (manage_passwords_bubble_ui_controller->autofill_blocked()) {
+    manage_passwords_bubble_state_ = NEVER_SAVE_PASSWORDS;
   } else {
     manage_passwords_bubble_state_ = MANAGE_PASSWORDS;
   }
 
   title_ = l10n_util::GetStringUTF16(
       (manage_passwords_bubble_state_ == PASSWORD_TO_BE_SAVED) ?
           IDS_SAVE_PASSWORD : IDS_MANAGE_PASSWORDS);
   best_matches_ = manage_passwords_bubble_ui_controller->best_matches();
   manage_link_ =
       l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK);
 }
 
 ManagePasswordsBubbleModel::~ManagePasswordsBubbleModel() {}
 
 void ManagePasswordsBubbleModel::OnBubbleShown(
     ManagePasswordsBubble::DisplayReason reason) {
-  DCHECK(WaitingToSavePassword() ||
-         reason == ManagePasswordsBubble::USER_ACTION);
   if (reason == ManagePasswordsBubble::USER_ACTION) {
     if (WaitingToSavePassword()) {
       display_disposition_ =
           password_manager::metrics_util::MANUAL_WITH_PASSWORD_PENDING;
+    } else if (NeverSavingPasswords()) {
+      display_disposition_ = password_manager::metrics_util::MANUAL_BLACKLISTED;
     } else {
-      // TODO(mkwst): Deal with "Never save passwords" once we've decided how
-      // that flow should work.
       display_disposition_ =
           password_manager::metrics_util::MANUAL_MANAGE_PASSWORDS;
     }
   } else {
+    DCHECK(WaitingToSavePassword());
     display_disposition_ =
         password_manager::metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING;
   }
   password_manager::metrics_util::LogUIDisplayDisposition(display_disposition_);
 
   // Default to a dismissal reason of "no interaction". If the user interacts
   // with the button in such a way that it closes, we'll reset this value
   // accordingly.
   dismissal_reason_ = password_manager::metrics_util::NO_DIRECT_INTERACTION;
 }
@@ skipping 16 matching lines @@
 
 void ManagePasswordsBubbleModel::OnNeverForThisSiteClicked() {
   dismissal_reason_ = password_manager::metrics_util::CLICKED_NEVER;
   ManagePasswordsBubbleUIController* manage_passwords_bubble_ui_controller =
       ManagePasswordsBubbleUIController::FromWebContents(web_contents_);
   manage_passwords_bubble_ui_controller->NeverSavePassword();
   manage_passwords_bubble_ui_controller->unset_password_to_be_saved();
   manage_passwords_bubble_state_ = NEVER_SAVE_PASSWORDS;
 }
 
+void ManagePasswordsBubbleModel::OnUnblacklistClicked() {
+  dismissal_reason_ = password_manager::metrics_util::CLICKED_UNBLACKLIST;
+  ManagePasswordsBubbleUIController* manage_passwords_bubble_ui_controller =
+      ManagePasswordsBubbleUIController::FromWebContents(web_contents_);
+  manage_passwords_bubble_ui_controller->UnblacklistSite();
+  manage_passwords_bubble_state_ = MANAGE_PASSWORDS;
+}
+
 void ManagePasswordsBubbleModel::OnSaveClicked() {
   dismissal_reason_ = password_manager::metrics_util::CLICKED_SAVE;
   ManagePasswordsBubbleUIController* manage_passwords_bubble_ui_controller =
       ManagePasswordsBubbleUIController::FromWebContents(web_contents_);
   manage_passwords_bubble_ui_controller->SavePassword();
   manage_passwords_bubble_ui_controller->unset_password_to_be_saved();
   manage_passwords_bubble_state_ = MANAGE_PASSWORDS;
 }
 
 void ManagePasswordsBubbleModel::OnDoneClicked() {
@@ skipping 21 matching lines @@
     password_store->RemoveLogin(password_form);
   else
     password_store->AddLogin(password_form);
 }
 
 void ManagePasswordsBubbleModel::WebContentsDestroyed(
     content::WebContents* web_contents) {
   // The WebContents have been destroyed.
   web_contents_ = NULL;
 }