Fix DCHECK when opening two password bubbles one after another.

chrome/browser/ui/cocoa/passwords/passwords_bubble_cocoa.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/passwords/passwords_bubble_cocoa.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_block.h"
 #include "chrome/browser/ui/browser_finder.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
@@ skipping 27 matching lines @@
 
 // static
 ManagePasswordsBubbleCocoa* ManagePasswordsBubbleCocoa::bubble_ = NULL;
 
 ManagePasswordsBubbleCocoa::ManagePasswordsBubbleCocoa(
     content::WebContents* webContents,
     ManagePasswordsBubbleModel::DisplayReason displayReason,
     ManagePasswordsIcon* icon)
     : model_(webContents, displayReason),
       icon_(icon),
-      closing_(false),
       controller_(nil),
       webContents_(webContents),
       bridge_(nil) {
   DCHECK(icon_);
   icon_->SetActive(true);
 }
 
 ManagePasswordsBubbleCocoa::~ManagePasswordsBubbleCocoa() {
   [[NSNotificationCenter defaultCenter] removeObserver:bridge_];
   // Clear the global bubble_ pointer.
@@ skipping 22 matching lines @@
       initWithCallback:^{
           OnClose();
       }]);
   [[NSNotificationCenter defaultCenter]
       addObserver:bridge_
          selector:@selector(onClose)
              name:NSWindowWillCloseNotification
            object:[controller_ window]];
 }
 
-void ManagePasswordsBubbleCocoa::Close() {
-  if (!closing_) {
-    closing_ = true;
-    [controller_ close];
+void ManagePasswordsBubbleCocoa::Close(bool no_animation) {
+  if (no_animation) {
+    InfoBubbleWindow* window = base::mac::ObjCCastStrict<InfoBubbleWindow>(
+        [controller_ window]);
+    [window setAllowedAnimations:info_bubble::kAnimateNone];
   }
+  [controller_ close];
 }
 
 void ManagePasswordsBubbleCocoa::OnClose() {
   delete this;
 }
 
 // static
 void ManagePasswordsBubbleCocoa::Show(content::WebContents* webContents,
                                       bool user_action) {
   if (bubble_) {
     // The bubble is currently shown. It's to be reopened with the new content.
     // Disable closing animation so that it's destroyed immediately.
-    InfoBubbleWindow* window = base::mac::ObjCCastStrict<InfoBubbleWindow>(
-        [bubble_->controller_ window]);
-    [window setAllowedAnimations:info_bubble::kAnimateNone];
-    bubble_->Close();
+    bubble_->Close(true);

[vabr (Chromium), 2016/07/28 16:59:12]

If this is the only callsite, then why don't you hard-code the argument value?

[vasilii, 2016/07/28 17:11:37]

It's not. There is also ManagePasswordsDecoration::HideBubble.

[vabr (Chromium), 2016/07/28 17:14:17]

But that one contains a Close call without arguments. How does that work?

   }
   DCHECK(!bubble_);
 
   NSWindow* window = [webContents->GetNativeView() window];
   if (!window) {
     // The tab isn't active right now.
     return;
   }
   BrowserWindowController* bwc =
       [BrowserWindowController browserWindowControllerForWindow:window];
   bubble_ = new ManagePasswordsBubbleCocoa(
       webContents, user_action ? ManagePasswordsBubbleModel::USER_ACTION
                                : ManagePasswordsBubbleModel::AUTOMATIC,
       [bwc locationBarBridge]->manage_passwords_decoration()->icon());
 
   bubble_->Show(user_action);
 }