Clean password_manager::ui::State

chrome/browser/ui/passwords/manage_passwords_ui_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_UI_CONTROLLER_H_
 #define CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_UI_CONTROLLER_H_
 
 #include "base/memory/scoped_vector.h"
 #include "base/timer/elapsed_timer.h"
 #include "components/autofill/core/common/password_form.h"
@@ skipping 90 matching lines @@
 
   virtual const autofill::PasswordForm& PendingPassword() const;
 
   // Set the state of the Omnibox icon, and possibly show the associated bubble
   // without user interaction.
   virtual void UpdateIconAndBubbleState(ManagePasswordsIcon* icon);
 
   // Called from the model when the bubble is displayed.
   void OnBubbleShown();
 
+  // Called from the model when the bubble is hidden.
+  void OnBubbleHidden();
+
   password_manager::ui::State state() const { return state_; }
 
   ScopedVector<autofill::PasswordForm>& federated_credentials_forms() {
     return federated_credentials_forms_;
   }
 
   ScopedVector<autofill::PasswordForm>& local_credentials_forms() {
     return local_credentials_forms_;
   }
 
   // True if a password is sitting around, waiting for a user to decide whether
   // or not to save it.
   bool PasswordPendingUserDecision() const;
 
   const autofill::ConstPasswordFormMap& best_matches() const {
     return password_form_map_;
   }
 
   const GURL& origin() const { return origin_; }
 
+  bool IsAutomaticallyOpeningBubble() const { return should_pop_up_bubble_; }
+
  protected:
   explicit ManagePasswordsUIController(
       content::WebContents* web_contents);
 
   // The pieces of saving and blacklisting passwords that interact with
   // FormManager, split off into internal functions for testing/mocking.
   virtual void SavePasswordInternal();
   virtual void NeverSavePasswordInternal();
 
   // Called when a passwordform is autofilled, when a new passwordform is
@@ skipping 29 matching lines @@
   ScopedVector<autofill::PasswordForm> local_credentials_forms_;
 
   // All previously stored credentials for a specific site.
   // Protected, not private, so we can mess with the value in
   // ManagePasswordsUIControllerMock.
   autofill::ConstPasswordFormMap password_form_map_;
 
  private:
   friend class content::WebContentsUserData<ManagePasswordsUIController>;
 
-  // Shows the password bubble without user interaction. The controller MUST
-  // be in PENDING_PASSWORD_AND_BUBBLE_STATE.
+  // Shows the password bubble without user interaction.
   void ShowBubbleWithoutUserInteraction();
 
   // content::WebContentsObserver:
   void WebContentsDestroyed() override;
 
   // The current state of the password manager UI.
   password_manager::ui::State state_;
 
   // Used to measure the amount of time on a page; if it's less than some
   // reasonable limit, then don't close the bubble upon navigation. We create
   // (and destroy) the timer in DidNavigateMainFrame.
   scoped_ptr<base::ElapsedTimer> timer_;
 
   // Set by OnPasswordSubmitted() when the user submits a form containing login
   // information.  If the user responds to a subsequent "Do you want to save
   // this password?" prompt, we ask this object to save or blacklist the
   // associated login information in Chrome's password store.
   scoped_ptr<password_manager::PasswordFormManager> form_manager_;
 
   // A callback to be invoked when user selects a credential.
   base::Callback<void(const password_manager::CredentialInfo&)>
       credentials_callback_;
 
-  // Contains true is the bubble's appeared during the last call to
+  // Contains true if the bubble is to be popped up in the next call to
   // UpdateBubbleAndIconVisibility().
-  bool bubble_shown_;
+  bool should_pop_up_bubble_;
 
   // The origin of the form we're currently dealing with; we'll use this to
   // determine which PasswordStore changes we should care about when updating
   // |password_form_map_|.
   GURL origin_;
 
   DISALLOW_COPY_AND_ASSIGN(ManagePasswordsUIController);
 };
 
 #endif  // CHROME_BROWSER_UI_PASSWORDS_MANAGE_PASSWORDS_UI_CONTROLLER_H_