Call bubble delegate Close function when bubble is closed by tab

chrome/browser/ui/cocoa/website_settings/chooser_bubble_ui_cocoa.mm

 // Copyright 2015 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/website_settings/chooser_bubble_ui_cocoa.h"
 
 #include <algorithm>
 #include <cmath>
 #include <vector>
 
@@ skipping 47 matching lines @@
  @private
   // Bridge to the C++ class that created this object.
   ChooserBubbleUiCocoa* bridge_;
 
   base::scoped_nsobject<NSTextField> titleView_;
   base::scoped_nsobject<NSScrollView> scrollView_;
   base::scoped_nsobject<NSTableColumn> tableColumn_;
   base::scoped_nsobject<NSTableView> tableView_;
   base::scoped_nsobject<NSButton> connectButton_;
   base::scoped_nsobject<NSButton> cancelButton_;
+  bool buttonPressed_;
 
   Browser* browser_;                                // Weak.
   ChooserBubbleDelegate* chooserBubbleDelegate_;    // Weak.
 }
 
 // Designated initializer.  |browser| and |bridge| must both be non-nil.
 - (id)initWithBrowser:(Browser*)browser
     initWithChooserBubbleDelegate:(ChooserBubbleDelegate*)chooserBubbleDelegate
                            bridge:(ChooserBubbleUiCocoa*)bridge;
 
@@ skipping 52 matching lines @@
 
 @implementation ChooserBubbleUiController
 
 - (id)initWithBrowser:(Browser*)browser
     initWithChooserBubbleDelegate:(ChooserBubbleDelegate*)chooserBubbleDelegate
                            bridge:(ChooserBubbleUiCocoa*)bridge {
   DCHECK(browser);
   DCHECK(chooserBubbleDelegate);
   DCHECK(bridge);
 
+  buttonPressed_ = false;

[Robert Sesek, 2015/12/21 21:22:17]

Can remove, ObjC objects are zero-initialized.

[juncai, 2015/12/21 21:38:04]

Done.

   browser_ = browser;
   chooserBubbleDelegate_ = chooserBubbleDelegate;
 
   base::scoped_nsobject<InfoBubbleWindow> window([[InfoBubbleWindow alloc]
       initWithContentRect:ui::kWindowSizeDeterminedLater
                 styleMask:NSBorderlessWindowMask
                   backing:NSBackingStoreBuffered
                     defer:NO]);
   [window setAllowedAnimations:info_bubble::kAnimateNone];
   [window setReleasedWhenClosed:NO];
@@ skipping 11 matching lines @@
                  object:[self getExpectedParentWindow]];
   }
   return self;
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
   [[NSNotificationCenter defaultCenter]
       removeObserver:self
                 name:NSWindowDidMoveNotification
               object:nil];
+  if (!buttonPressed_)
+    chooserBubbleDelegate_->Close();
   bridge_->OnBubbleClosing();
   [super windowWillClose:notification];
 }
 
 - (void)parentWindowWillToggleFullScreen:(NSNotification*)notification {
   // Override the base class implementation, which would have closed the bubble.
 }
 
 - (void)parentWindowDidResize:(NSNotification*)notification {
   [self setAnchorPoint:[self getExpectedAnchorPoint]];
@@ skipping 256 matching lines @@
 
 + (void)alignCenterOf:(NSView*)viewA verticallyToCenterOf:(NSView*)viewB {
   NSRect frameA = [viewA frame];
   NSRect frameB = [viewB frame];
   frameA.origin.y =
       NSMinY(frameB) + std::floor((NSHeight(frameB) - NSHeight(frameA)) / 2);
   [viewA setFrameOrigin:frameA.origin];
 }
 
 - (void)onConnect:(id)sender {
+  buttonPressed_ = true;
   NSInteger row = [tableView_ selectedRow];
   chooserBubbleDelegate_->Select(row);
   [self close];
 }
 
 - (void)onCancel:(id)sender {
+  buttonPressed_ = true;
   chooserBubbleDelegate_->Cancel();
   [self close];
 }
 
 @end
 
 ChooserBubbleUiCocoa::ChooserBubbleUiCocoa(
     Browser* browser,
     ChooserBubbleDelegate* chooser_bubble_delegate)
     : browser_(browser),
@@ skipping 39 matching lines @@
   [chooser_bubble_ui_controller_ onOptionAdded:index];
 }
 
 void ChooserBubbleUiCocoa::OnOptionRemoved(int index) {
   [chooser_bubble_ui_controller_ onOptionRemoved:index];
 }
 
 void ChooserBubbleUiCocoa::OnBubbleClosing() {
   chooser_bubble_ui_controller_ = nil;
 }