Close the password bubble on the icon click.

chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc

Index: chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
diff --git a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
index 356919e43c008c9ec0c899d2b20ca244aa3204db..56f94fae06b5a037a450eec92fe8defa4f143ede 100644
--- a/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
+++ b/chrome/browser/ui/views/passwords/manage_passwords_bubble_view.cc
@@ -126,6 +126,12 @@ void AddTitleRow(views::GridLayout* layout, ManagePasswordsBubbleModel* model) {
 namespace chrome {
 
 void ShowManagePasswordsBubble(content::WebContents* web_contents) {
+  if (ManagePasswordsBubbleView::IsShowing()) {
+    // IDC_MANAGE_PASSWORDS_FOR_PAGE command cann't open the bubble twice for
+    // the same tab. However, the bubble may be open in another tab.
+    DCHECK(ManagePasswordsBubbleView::Bubble()->web_contents() != web_contents);

[Peter Kasting, 2014/07/22 18:55:18]

If this DCHECK is the only reason to expose web_contents() accessors on two
different classes, I think we should just kill the DCHECK and not expose those.

[vasilii, 2014/07/23 09:22:53]

Done.

+    ManagePasswordsBubbleView::CloseBubble();
+  }
   ManagePasswordsUIController* controller =
       ManagePasswordsUIController::FromWebContents(web_contents);
   ManagePasswordsBubbleView::ShowBubble(
@@ -434,11 +440,6 @@ ManagePasswordsBubbleView* ManagePasswordsBubbleView::manage_passwords_bubble_ =
     NULL;
 
 // static
-const ManagePasswordsBubbleView* ManagePasswordsBubbleView::Bubble() {
-  return ManagePasswordsBubbleView::manage_passwords_bubble_;
-}
-
-// static
 void ManagePasswordsBubbleView::ShowBubble(content::WebContents* web_contents,
                                            DisplayReason reason) {
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
@@ -493,6 +494,15 @@ bool ManagePasswordsBubbleView::IsShowing() {
       manage_passwords_bubble_->GetWidget()->IsVisible();
 }
 
+// static
+const ManagePasswordsBubbleView* ManagePasswordsBubbleView::Bubble() {
+  return ManagePasswordsBubbleView::manage_passwords_bubble_;
+}
+
+content::WebContents* ManagePasswordsBubbleView::web_contents() const {
+  return model()->web_contents();
+}
+
 ManagePasswordsBubbleView::ManagePasswordsBubbleView(
     content::WebContents* web_contents,
     ManagePasswordsIconView* anchor_view,