Ignore OnBubbleHidden() event when the password bubble is reopened.

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),
-      bubble_status_(NOT_SHOWN) {
+      bubble_status_(NOT_SHOWN),
+      weak_ptr_factory_(this) {
   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() {}
 
@@ skipping 94 matching lines @@
   password_manager::ui::State current_state = GetState();
   passwords_data_.ProcessLoginsChanged(changes);
   if (current_state != GetState())
     UpdateBubbleAndIconVisibility();
 }
 
 void ManagePasswordsUIController::UpdateIconAndBubbleState(
     ManagePasswordsIconView* icon) {
   if (bubble_status_ == SHOULD_POP_UP) {
     DCHECK(!dialog_controller_);
+    // This will detach any existing bubble so OnBubbleHidden() isn't called.
+    weak_ptr_factory_.InvalidateWeakPtrs();
     // 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);
   }
 }
 
+base::WeakPtr<PasswordsModelDelegate>
+ManagePasswordsUIController::GetModelDelegateProxy() {
+  return weak_ptr_factory_.GetWeakPtr();
+}
+
+content::WebContents* ManagePasswordsUIController::GetWebContents() const {
+  return web_contents();
+}
+
 const GURL& ManagePasswordsUIController::GetOrigin() const {
   return passwords_data_.origin();
 }
 
 password_manager::ui::State ManagePasswordsUIController::GetState() const {
   return passwords_data_.state();
 }
 
 const autofill::PasswordForm& ManagePasswordsUIController::
     GetPendingPassword() const {
@@ skipping 87 matching lines @@
 
 void ManagePasswordsUIController::UpdatePassword(
     const autofill::PasswordForm& password_form) {
   DCHECK_EQ(password_manager::ui::PENDING_PASSWORD_UPDATE_STATE, GetState());
   UpdatePasswordInternal(password_form);
   passwords_data_.TransitionToState(password_manager::ui::MANAGE_STATE);
   UpdateBubbleAndIconVisibility();
 }
 
 void ManagePasswordsUIController::ChooseCredential(
-    autofill::PasswordForm form,
+    const autofill::PasswordForm& form,
     password_manager::CredentialType credential_type) {
   DCHECK(dialog_controller_);
   DCHECK_EQ(password_manager::CredentialType::CREDENTIAL_TYPE_PASSWORD,
             credential_type);
+  // Copy the argument before destroying the controller. |form| is a member of
+  // |dialog_controller_|.
+  autofill::PasswordForm copy_form = form;
   dialog_controller_.reset();
-  passwords_data_.ChooseCredential(&form);
+  passwords_data_.ChooseCredential(&copy_form);
   passwords_data_.TransitionToState(password_manager::ui::MANAGE_STATE);
   UpdateBubbleAndIconVisibility();
 }
 
 void ManagePasswordsUIController::NavigateToExternalPasswordManager() {
   chrome::NavigateParams params(
       chrome::FindBrowserWithWebContents(web_contents()),
       GURL(password_manager::kPasswordManagerAccountDashboardURL),
       ui::PAGE_TRANSITION_LINK);
   params.disposition = NEW_FOREGROUND_TAB;
@@ skipping 120 matching lines @@
     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);
 }