Clean password_manager::ui::State

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/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 102 matching lines @@
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       never_save_passwords_(false),
       display_disposition_(metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING),
       dismissal_reason_(metrics_util::NOT_DISPLAYED) {
   ManagePasswordsUIController* controller =
       ManagePasswordsUIController::FromWebContents(web_contents);
 
   origin_ = controller->origin();
   state_ = controller->state();
-  if (password_manager::ui::IsPendingState(state_))
+  if (state_ == password_manager::ui::PENDING_PASSWORD_STATE)
     pending_password_ = controller->PendingPassword();
-  if (password_manager::ui::IsCredentialsState(state_)) {
+  if (state_ == password_manager::ui::CREDENTIAL_REQUEST_STATE) {
     local_pending_credentials_.swap(controller->local_credentials_forms());
     federated_pending_credentials_.swap(
         controller->federated_credentials_forms());
   } else {
     best_matches_ = controller->best_matches();
   }
 
-  if (password_manager::ui::IsPendingState(state_)) {
+  if (state_ == password_manager::ui::PENDING_PASSWORD_STATE) {
     title_ = PendingStateTitleBasedOnSavePasswordPref(never_save_passwords_);
   } 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_)) {
+  } else if (state_ == password_manager::ui::CREDENTIAL_REQUEST_STATE) {
     title_ = l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_CHOOSE_TITLE);
   } else if (password_manager::ui::IsAskSubmitURLState(state_)) {
     title_ =
         l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_ASK_TO_SUBMIT_URL_TITLE);
   } else {
     title_ = l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_TITLE);
   }
 
   base::string16 save_confirmation_link =
       l10n_util::GetStringUTF16(IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_LINK);
   size_t offset;
   save_confirmation_text_ =
       l10n_util::GetStringFUTF16(IDS_MANAGE_PASSWORDS_CONFIRM_GENERATED_TEXT,
                                  save_confirmation_link, &offset);
   save_confirmation_link_range_ =
       gfx::Range(offset, offset + save_confirmation_link.length());
 
   manage_link_ =
       l10n_util::GetStringUTF16(IDS_OPTIONS_PASSWORDS_MANAGE_PASSWORDS_LINK);
 }
 
 ManagePasswordsBubbleModel::~ManagePasswordsBubbleModel() {}
 
 void ManagePasswordsBubbleModel::OnBubbleShown(
     ManagePasswordsBubble::DisplayReason reason) {
   if (reason == ManagePasswordsBubble::USER_ACTION) {
-    if (password_manager::ui::IsPendingState(state_)) {
+    if (state_ == password_manager::ui::PENDING_PASSWORD_STATE) {
       display_disposition_ = metrics_util::MANUAL_WITH_PASSWORD_PENDING;
     } else if (state_ == password_manager::ui::BLACKLIST_STATE) {
       display_disposition_ = metrics_util::MANUAL_BLACKLISTED;
     } else {
       display_disposition_ = metrics_util::MANUAL_MANAGE_PASSWORDS;
     }
   } else {
     if (state_ == password_manager::ui::CONFIRMATION_STATE) {
       display_disposition_ =
           metrics_util::AUTOMATIC_GENERATED_PASSWORD_CONFIRMATION;
-    } else if (password_manager::ui::IsCredentialsState(state_)) {
+    } else if (state_ == password_manager::ui::CREDENTIAL_REQUEST_STATE) {
       display_disposition_ = metrics_util::AUTOMATIC_CREDENTIAL_REQUEST;
     } else {
       display_disposition_ = metrics_util::AUTOMATIC_WITH_PASSWORD_PENDING;
     }
   }
   if (password_manager::ui::IsAskSubmitURLState(state_))
     RecordURLsCollectionExperimentStatistics(web_contents());
   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_ = metrics_util::NO_DIRECT_INTERACTION;
 
   ManagePasswordsUIController* controller =
       ManagePasswordsUIController::FromWebContents(web_contents());
   controller->OnBubbleShown();
 }
 
 void ManagePasswordsBubbleModel::OnBubbleHidden() {
-  if (password_manager::ui::IsCredentialsState(state_) && web_contents()) {
+  ManagePasswordsUIController* manage_passwords_ui_controller =
+      web_contents() ?
+          ManagePasswordsUIController::FromWebContents(web_contents())

[Mike West, 2015/02/16 11:45:33]

Does `::FromWebContents()` not return `nullptr` in this case already?

[vasilii, 2015/02/16 11:51:44]

It returns "null pointer exception" via go/crash instead.

+          : nullptr;
+  if (state_ == password_manager::ui::CREDENTIAL_REQUEST_STATE &&
+      manage_passwords_ui_controller) {
     // It's time to run the pending callback if it wasn't called in
     // OnChooseCredentials().
-    ManagePasswordsUIController* manage_passwords_ui_controller =
-        ManagePasswordsUIController::FromWebContents(web_contents());
     manage_passwords_ui_controller->ChooseCredential(
         autofill::PasswordForm(),
         password_manager::CredentialType::CREDENTIAL_TYPE_EMPTY);
     state_ = password_manager::ui::INACTIVE_STATE;
   }
+  if (manage_passwords_ui_controller)
+    manage_passwords_ui_controller->OnBubbleHidden();
   if (dismissal_reason_ == metrics_util::NOT_DISPLAYED)
     return;
 
   if (password_manager::ui::IsAskSubmitURLState(state_)) {
     state_ = password_manager::ui::ASK_USER_REPORT_URL_BUBBLE_SHOWN_STATE;
     metrics_util::LogAllowToCollectURLBubbleUIDismissalReason(
         dismissal_reason_);
     // Return since we do not want to include "Allow to collect URL?" bubble
     // data in other PasswordManager metrics.
     return;
@@ skipping 22 matching lines @@
   dismissal_reason_ = metrics_util::CLICKED_DO_NOT_COLLECT_URL;
   RecordExperimentStatistics(web_contents(), dismissal_reason_);
   // User interaction with bubble has happened, do not need to show bubble
   // in case it was before transition to another page.
   state_ = password_manager::ui::ASK_USER_REPORT_URL_BUBBLE_SHOWN_STATE;
 }
 
 void ManagePasswordsBubbleModel::OnNopeClicked() {
   dismissal_reason_ = metrics_util::CLICKED_NOPE;
   RecordExperimentStatistics(web_contents(), dismissal_reason_);
-  if (!password_manager::ui::IsCredentialsState(state_))
+  if (state_ != password_manager::ui::CREDENTIAL_REQUEST_STATE)
     state_ = password_manager::ui::PENDING_PASSWORD_STATE;
 }
 
 void ManagePasswordsBubbleModel::OnConfirmationForNeverForThisSite() {
   never_save_passwords_ = true;
   title_ = PendingStateTitleBasedOnSavePasswordPref(never_save_passwords_);
 }
 
 void ManagePasswordsBubbleModel::OnUndoNeverForThisSite() {
   never_save_passwords_ = false;
@@ skipping 77 matching lines @@
 
 // static
 int ManagePasswordsBubbleModel::UsernameFieldWidth() {
   return GetFieldWidth(USERNAME_FIELD);
 }
 
 // static
 int ManagePasswordsBubbleModel::PasswordFieldWidth() {
   return GetFieldWidth(PASSWORD_FIELD);
 }