Password bubble: refactor ManagePasswordsIconView.

chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h

Index: chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h
diff --git a/chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h b/chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h
index abe6de4dee3d859f622d3f225763da4d452dacb9..f99dca426b8a25f9d734d811b82d81c5ba3a8330 100644
--- a/chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h
+++ b/chrome/browser/ui/passwords/manage_passwords_bubble_ui_controller.h
@@ -16,6 +16,8 @@ namespace content {
 class WebContents;
 }
 
+class ManagePasswordsIcon;
+
 // Per-tab class to control the Omnibox password icon and bubble.
 class ManagePasswordsBubbleUIController
     : public content::WebContentsObserver,
@@ -51,15 +53,15 @@ class ManagePasswordsBubbleUIController
   // the action off to the FormManager.
   virtual void NeverSavePassword();
 
-  // Called when the bubble is opened after the icon gets displayed. We change
-  // the state to know that we do not need to pop up the bubble again.
-  void OnBubbleShown();
-
   // Open a new tab, pointing to the password manager settings page.
   virtual void NavigateToPasswordManagerSettingsPage();
 
   virtual const autofill::PasswordForm& PendingCredentials() const;
 
+  // Set the state of the Omnibox icon, and possibly show the associated bubble
+  // without user interaction.
+  virtual void UpdateIconAndBubbleState(ManagePasswordsIcon* icon);
+
   bool manage_passwords_icon_to_be_shown() const {
     return manage_passwords_icon_to_be_shown_;
   }
@@ -72,10 +74,6 @@ class ManagePasswordsBubbleUIController
     return manage_passwords_bubble_needs_showing_;
   }
 
-  void unset_manage_passwords_bubble_needs_showing() {
-    manage_passwords_bubble_needs_showing_ = false;
-  }
-
   void unset_password_to_be_saved() {
     password_to_be_saved_ = false;
   }
@@ -89,6 +87,8 @@ class ManagePasswordsBubbleUIController
     autofill_blocked_ = autofill_blocked;
   }
 
+  const GURL& origin() const { return origin_; }
+
  protected:
   explicit ManagePasswordsBubbleUIController(
       content::WebContents* web_contents);