Moving member never_save_password of ManagePasswordsBubbleView to ManagePasswordsBubbleModel

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_ui_controller.h"
@@ skipping 25 matching lines @@
 
 void RecordExperimentStatistics(content::WebContents* web_contents,
                                 metrics_util::UIDismissalReason reason) {
   if (!web_contents)
     return;
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   password_bubble_experiment::RecordBubbleClosed(profile->GetPrefs(), reason);
 }
 
+base::string16 PendingStateTitleBasedOnSafePasswordPref(
+    bool never_save_passwords) {
+  if (!never_save_passwords)

[Mike West, 2014/12/04 00:11:48]

Negations are confusing. :)

How about something more like:

    return l10n_util::GetStringUTF16(never_save_passwords ? IDS_MANAGE... :
IDS_SAVE_...);

[melandory, 2014/12/04 09:41:30]

Done.

+    return l10n_util::GetStringUTF16(IDS_SAVE_PASSWORD);
+  else
+    return l10n_util::GetStringUTF16(
+        IDS_MANAGE_PASSWORDS_BLACKLIST_CONFIRMATION_TITLE);
+}
+
 }  // namespace
 
 ManagePasswordsBubbleModel::ManagePasswordsBubbleModel(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
-      display_disposition_(
-          metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING),
+      never_save_passwords_(false),
+      display_disposition_(metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING),
       dismissal_reason_(metrics_util::NOT_DISPLAYED) {
   ManagePasswordsUIController* controller =
       ManagePasswordsUIController::FromWebContents(web_contents);
 
   state_ = controller->state();
   if (password_manager::ui::IsPendingState(state_))
     pending_password_ = controller->PendingPassword();
   if (password_manager::ui::IsCredentialsState(state_))
     pending_credentials_.swap(controller->new_password_forms());
   else
     best_matches_ = controller->best_matches();
 
   if (password_manager::ui::IsPendingState(state_)) {
-    title_ = l10n_util::GetStringUTF16(IDS_SAVE_PASSWORD);
+    title_ = PendingStateTitleBasedOnSafePasswordPref(never_save_passwords_);

[Mike West, 2014/12/04 00:11:48]

Nit: s/Safe/Save/?

[melandory, 2014/12/04 09:41:30]

Done.

   } else if (state_ == password_manager::ui::BLACKLIST_STATE) {
     title_ = l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_BLACKLISTED_TITLE);
   } else if (state_ == password_manager::ui::CONFIRMATION_STATE) {
     title_ =
         l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TITLE);
   } else if (password_manager::ui::IsCredentialsState(state_)) {
     title_ = l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_CHOOSE_TITLE);
   } else {
     title_ = l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_TITLE);
   }
@@ skipping 64 matching lines @@
     RecordExperimentStatistics(web_contents(), dismissal_reason_);
 }
 
 void ManagePasswordsBubbleModel::OnNopeClicked() {
   dismissal_reason_ = metrics_util::CLICKED_NOPE;
   RecordExperimentStatistics(web_contents(), dismissal_reason_);
   if (!password_manager::ui::IsCredentialsState(state_))
     state_ = password_manager::ui::PENDING_PASSWORD_STATE;
 }
 
+void ManagePasswordsBubbleModel::OnConfirmationForNeverForThisSite() {
+  never_save_passwords_ = true;
+  PendingStateTitleBasedOnSafePasswordPref(never_save_passwords_);

[Mike West, 2014/12/04 00:11:48]

You're not doing anything with the result of this call. Is that intentional?

[melandory, 2014/12/04 09:41:30]

Nope. It's bug, thanks for catching.

+}
+
+void ManagePasswordsBubbleModel::OnUndoNeverForThisSite() {
+  never_save_passwords_ = false;
+  PendingStateTitleBasedOnSafePasswordPref(never_save_passwords_);

[Mike West, 2014/12/04 00:11:48]

Ditto.

[melandory, 2014/12/04 09:41:30]

Done.

+}
+
 void ManagePasswordsBubbleModel::OnNeverForThisSiteClicked() {
   dismissal_reason_ = metrics_util::CLICKED_NEVER;
   RecordExperimentStatistics(web_contents(), dismissal_reason_);
   ManagePasswordsUIController* manage_passwords_ui_controller =
       ManagePasswordsUIController::FromWebContents(web_contents());
   manage_passwords_ui_controller->NeverSavePassword();
   state_ = password_manager::ui::BLACKLIST_STATE;
 }
 
 void ManagePasswordsBubbleModel::OnUnblacklistClicked() {
@@ skipping 58 matching lines @@
 
 // static
 int ManagePasswordsBubbleModel::UsernameFieldWidth() {
   return GetFieldWidth(USERNAME_FIELD);
 }
 
 // static
 int ManagePasswordsBubbleModel::PasswordFieldWidth() {
   return GetFieldWidth(PASSWORD_FIELD);
 }