Don't close the password bubble on implicit navigations.

chrome/browser/ui/passwords/manage_passwords_ui_controller.cc

 // Copyright 2014 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_ui_controller.h"
 
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 41 matching lines @@
   return result;
 }
 
 }  // namespace
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ManagePasswordsUIController);
 
 ManagePasswordsUIController::ManagePasswordsUIController(
     content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
-      should_pop_up_bubble_(false) {
+      bubble_status_(NOT_SHOWN) {
   passwords_data_.set_client(
       ChromePasswordManagerClient::FromWebContents(web_contents));
   password_manager::PasswordStore* password_store =
       GetPasswordStore(web_contents);
   if (password_store)
     password_store->AddObserver(this);
 }
 
 ManagePasswordsUIController::~ManagePasswordsUIController() {}
 
 void ManagePasswordsUIController::OnPasswordSubmitted(
     scoped_ptr<PasswordFormManager> form_manager) {
   bool show_bubble = !form_manager->IsBlacklisted();
   DestroyAccountChooser();
   passwords_data_.OnPendingPassword(std::move(form_manager));
   if (show_bubble) {
     password_manager::InteractionsStats* stats = GetCurrentInteractionStats();
     const int show_threshold =
         password_bubble_experiment::GetSmartBubbleDismissalThreshold();
     if (stats && show_threshold > 0 && stats->dismissal_count >= show_threshold)
       show_bubble = false;
   }
-  base::AutoReset<bool> resetter(&should_pop_up_bubble_, show_bubble);
+  if (show_bubble)
+    bubble_status_ = SHOULD_POP_UP;
   UpdateBubbleAndIconVisibility();
 }
 
 void ManagePasswordsUIController::OnUpdatePasswordSubmitted(
     scoped_ptr<PasswordFormManager> form_manager) {
   DestroyAccountChooser();
   passwords_data_.OnUpdatePassword(std::move(form_manager));
-  base::AutoReset<bool> resetter(&should_pop_up_bubble_, true);
+  bubble_status_ = SHOULD_POP_UP;
   UpdateBubbleAndIconVisibility();
 }
 
 bool ManagePasswordsUIController::OnChooseCredentials(
     ScopedVector<autofill::PasswordForm> local_credentials,
     ScopedVector<autofill::PasswordForm> federated_credentials,
     const GURL& origin,
     base::Callback<void(const password_manager::CredentialInfo&)> callback) {
   DCHECK(!local_credentials.empty() || !federated_credentials.empty());
   PasswordDialogController::FormsVector locals =
@@ skipping 11 matching lines @@
       std::move(locals), std::move(federations));
   UpdateBubbleAndIconVisibility();
   return true;
 }
 
 void ManagePasswordsUIController::OnAutoSignin(
     ScopedVector<autofill::PasswordForm> local_forms) {
   DCHECK(!local_forms.empty());
   DestroyAccountChooser();
   passwords_data_.OnAutoSignin(std::move(local_forms));
-  base::AutoReset<bool> resetter(&should_pop_up_bubble_, true);
+  bubble_status_ = SHOULD_POP_UP;
   UpdateBubbleAndIconVisibility();
 }
 
 void ManagePasswordsUIController::OnPromptEnableAutoSignin() {
   // Both the account chooser and the previous prompt shouldn't be closed.
   if (dialog_controller_)
     return;
   dialog_controller_.reset(new PasswordDialogControllerImpl(
       Profile::FromBrowserContext(web_contents()->GetBrowserContext()),
       this));
   dialog_controller_->ShowAutosigninPrompt(
       CreateAutoSigninPrompt(dialog_controller_.get()));
 }
 
 void ManagePasswordsUIController::OnAutomaticPasswordSave(
     scoped_ptr<PasswordFormManager> form_manager) {
   DestroyAccountChooser();
   passwords_data_.OnAutomaticPasswordSave(std::move(form_manager));
-  base::AutoReset<bool> resetter(&should_pop_up_bubble_, true);
+  bubble_status_ = SHOULD_POP_UP;
   UpdateBubbleAndIconVisibility();
 }
 
 void ManagePasswordsUIController::OnPasswordAutofilled(
     const PasswordFormMap& password_form_map,
     const GURL& origin) {
   // If we fill a form while a dialog is open, then skip the state change; we
   // have
   // the information we need, and the dialog will change its own state once the
   // interaction is complete.
   if (passwords_data_.state() !=
           password_manager::ui::AUTO_SIGNIN_STATE &&
       passwords_data_.state() !=
           password_manager::ui::CREDENTIAL_REQUEST_STATE) {
     passwords_data_.OnPasswordAutofilled(password_form_map, origin);
     UpdateBubbleAndIconVisibility();
   }
 }
 
 void ManagePasswordsUIController::OnLoginsChanged(
     const password_manager::PasswordStoreChangeList& changes) {
   password_manager::ui::State current_state = GetState();
   passwords_data_.ProcessLoginsChanged(changes);
   if (current_state != GetState())
     UpdateBubbleAndIconVisibility();
 }
 
 void ManagePasswordsUIController::UpdateIconAndBubbleState(
     ManagePasswordsIconView* icon) {
-  if (should_pop_up_bubble_) {
+  if (bubble_status_ == SHOULD_POP_UP) {
     DCHECK(!dialog_controller_);
     // We must display the icon before showing the bubble, as the bubble would
     // be otherwise unanchored.
     icon->SetState(GetState());
     ShowBubbleWithoutUserInteraction();
+    // If the bubble appeared then the status is updated in OnBubbleShown().
+    if (bubble_status_ == SHOULD_POP_UP)
+      bubble_status_ = NOT_SHOWN;
   } else {
     password_manager::ui::State state = GetState();
     // The dialog should hide the icon.
     if (dialog_controller_ &&
         state == password_manager::ui::CREDENTIAL_REQUEST_STATE)
       state = password_manager::ui::INACTIVE_STATE;
     icon->SetState(state);
   }
 }
 
@@ skipping 39 matching lines @@
 ManagePasswordsUIController::GetCurrentInteractionStats() const {
   DCHECK_EQ(password_manager::ui::PENDING_PASSWORD_STATE, GetState());
   password_manager::PasswordFormManager* form_manager =
       passwords_data_.form_manager();
   return password_manager::FindStatsByUsername(
       form_manager->interactions_stats(),
       form_manager->pending_credentials().username_value);
 }
 
 void ManagePasswordsUIController::OnBubbleShown() {
-  should_pop_up_bubble_ = false;
+  bubble_status_ = SHOWN;
 }
 
 void ManagePasswordsUIController::OnBubbleHidden() {
+  bubble_status_ = NOT_SHOWN;
   if (GetState() == password_manager::ui::CONFIRMATION_STATE ||
       GetState() == password_manager::ui::AUTO_SIGNIN_STATE) {
     passwords_data_.TransitionToState(password_manager::ui::MANAGE_STATE);
     UpdateBubbleAndIconVisibility();
   }
 }
 
 void ManagePasswordsUIController::OnNoInteractionOnUpdate() {
   if (GetState() != password_manager::ui::PENDING_PASSWORD_UPDATE_STATE) {
     // Do nothing if the state was changed. It can happen for example when the
@@ skipping 128 matching lines @@
   return CreateAutoSigninPromptView(controller, web_contents());
 }
 
 void ManagePasswordsUIController::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   // Don't react to in-page (fragment) navigations.
   if (details.is_in_page)
     return;
 
-  // Don't do anything if a redirect occurs. It is possible that the user was
-  // not able to interact with the password bubble.
-  if (ui::PageTransitionIsRedirect(params.transition))
+  // It is possible that the user was not able to interact with the password
+  // bubble.
+  if (bubble_status_ == SHOWN)
     return;
 
-  // Otherwise, reset the password manager and the timer.
+  // Otherwise, reset the password manager.
   DestroyAccountChooser();
   passwords_data_.OnInactive();
   UpdateBubbleAndIconVisibility();
 }
 
 void ManagePasswordsUIController::WasHidden() {
   TabDialogs::FromWebContents(web_contents())->HideManagePasswordsBubble();
 }
 
 void ManagePasswordsUIController::ShowBubbleWithoutUserInteraction() {
-  DCHECK(should_pop_up_bubble_);
+  DCHECK(IsAutomaticallyOpeningBubble());
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
   if (!browser || browser->toolbar_model()->input_in_progress())
     return;
 
   CommandUpdater* updater = browser->command_controller()->command_updater();
   updater->ExecuteCommand(IDC_MANAGE_PASSWORDS_FOR_PAGE);
 }
 
 void ManagePasswordsUIController::DestroyAccountChooser() {
   if (dialog_controller_ && dialog_controller_->IsShowingAccountChooser()) {
     dialog_controller_.reset();
     passwords_data_.TransitionToState(password_manager::ui::MANAGE_STATE);
   }
 }
 
 void ManagePasswordsUIController::WebContentsDestroyed() {
   password_manager::PasswordStore* password_store =
       GetPasswordStore(web_contents());
   if (password_store)
     password_store->RemoveObserver(this);
 }