Close the password bubble on the icon click.

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

 // Copyright 2013 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/views/passwords/manage_passwords_bubble_view.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 108 matching lines @@
 }
 
 }  // namespace
 
 
 // Globals --------------------------------------------------------------------
 
 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(
       web_contents,
       controller->state() ==
               password_manager::ui::PENDING_PASSWORD_AND_BUBBLE_STATE
           ? ManagePasswordsBubbleView::AUTOMATIC
           : ManagePasswordsBubbleView::USER_ACTION);
 }
 
@@ skipping 288 matching lines @@
   parent_->Close();
 }
 
 // ManagePasswordsBubbleView --------------------------------------------------
 
 // static
 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);
   DCHECK(browser);
   DCHECK(browser->window());
   DCHECK(browser->fullscreen_controller());
 
   if (IsShowing())
     return;
 
@@ skipping 34 matching lines @@
     manage_passwords_bubble_->Close();
 }
 
 // static
 bool ManagePasswordsBubbleView::IsShowing() {
   // The bubble may be in the process of closing.
   return (manage_passwords_bubble_ != NULL) &&
       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,
     DisplayReason reason)
     : ManagePasswordsBubble(web_contents, reason),
       BubbleDelegateView(anchor_view,
                          anchor_view ? views::BubbleBorder::TOP_RIGHT
                                      : views::BubbleBorder::NONE),
       anchor_view_(anchor_view),
       never_save_passwords_(false) {
@@ skipping 70 matching lines @@
 
 void ManagePasswordsBubbleView::NotifyConfirmedNeverForThisSite() {
   model()->OnNeverForThisSiteClicked();
   Close();
 }
 
 void ManagePasswordsBubbleView::NotifyUndoNeverForThisSite() {
   never_save_passwords_ = false;
   Refresh();
 }