MacViews: Implement CloseNow() as just -[NSWindow close].

ui/views/cocoa/bridged_native_widget.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 "ui/views/cocoa/bridged_native_widget.h"
 
 #import <objc/runtime.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 335 matching lines @@
       in_fullscreen_transition_(false),
       window_visible_(false),
       wants_to_be_visible_(false) {
   SetupDragEventMonitor();
   DCHECK(parent);
   window_delegate_.reset(
       [[ViewsNSWindowDelegate alloc] initWithBridgedNativeWidget:this]);
 }
 
 BridgedNativeWidget::~BridgedNativeWidget() {
-  bool close_window = false;
-  if ([window_ delegate]) {
-    // If the delegate is still set on a modal dialog, it means it was not
-    // closed via [NSApplication endSheet:]. This is probably OK if the widget
-    // was never shown. But Cocoa ignores close() calls on open sheets. Calling
-    // endSheet: here would work, but it messes up assumptions elsewhere. E.g.
-    // DialogClientView assumes its delegate is alive when closing, which isn't
-    // true after endSheet: synchronously calls OnNativeWidgetDestroyed().
-    // So ban it. Modal dialogs should be closed via Widget::Close().
-    DCHECK(!native_widget_mac_->IsWindowModalSheet());
-
-    // If the delegate is still set, it means OnWindowWillClose() has not been
-    // called and the window is still open. Usually, -[NSWindow close] would
-    // synchronously call OnWindowWillClose() which removes the delegate and
-    // notifies NativeWidgetMac, which then calls this with a nil delegate.
-    // For other teardown flows (e.g. Widget::WIDGET_OWNS_NATIVE_WIDGET or
-    // Widget::CloseNow()) the delegate must first be cleared to avoid AppKit
-    // calling back into the bridge. This means OnWindowWillClose() needs to be
-    // invoked manually, which is done below.
-    // Note that if the window has children it can't be closed until the
-    // children are gone, but removing child windows calls into AppKit for the
-    // parent window, so the delegate must be cleared first.
-    [window_ setDelegate:nil];
-    close_window = true;
-  }
+  // The delegate should be cleared already. Note this enforces the precondition
+  // that -[NSWindow close] is invoked on the hosted window before the
+  // destructor is called.
+  DCHECK(![window_ delegate]);
 
   RemoveOrDestroyChildren();
   DCHECK(child_windows_.empty());
   SetFocusManager(nullptr);
   SetRootView(nullptr);
   DestroyCompositor();
-
-  if (close_window) {
-    OnWindowWillClose();
-    [window_ close];
-  }
 }
 
 void BridgedNativeWidget::Init(base::scoped_nsobject<NSWindow> window,
                                const Widget::InitParams& params) {
   widget_type_ = params.type;
 
   DCHECK(!window_);
   window_.swap(window);
   [window_ setDelegate:window_delegate_];
 
@@ skipping 297 matching lines @@
 void* BridgedNativeWidget::GetNativeWindowProperty(const char* name) const {
   NSString* key = [NSString stringWithUTF8String:name];
   return [[GetWindowProperties() objectForKey:key] pointerValue];
 }
 
 void BridgedNativeWidget::SetCursor(NSCursor* cursor) {
   [window_delegate_ setCursor:cursor];
 }
 
 void BridgedNativeWidget::OnWindowWillClose() {
+  native_widget_mac_->GetWidget()->OnNativeWidgetDestroying();
+
   // Ensure BridgedNativeWidget does not have capture, otherwise
   // OnMouseCaptureLost() may reference a deleted |native_widget_mac_| when
   // called via ~CocoaMouseCapture() upon the destruction of |mouse_capture_|.
   // See crbug.com/622201. Also we do this before setting the delegate to nil,
   // because this may lead to callbacks to bridge which rely on a valid
   // delegate.
   ReleaseCapture();
 
   if (parent_) {
     parent_->RemoveChildWindow(this);
     parent_ = nullptr;
   }
   [[NSNotificationCenter defaultCenter] removeObserver:window_delegate_];
-  // Note this also clears the NSWindow delegate, after informing Widget
-  // delegates about the closure. NativeWidgetMac then deletes |this| before
-  // returning.
-  native_widget_mac_->OnWindowWillClose();
+  [window_ setDelegate:nil];
+  native_widget_mac_->OnWindowDestroyed();
+  // Note: |this| is deleted here.
 }
 
 void BridgedNativeWidget::OnFullscreenTransitionStart(
     bool target_fullscreen_state) {
   // Note: This can fail for fullscreen changes started externally, but a user
   // shouldn't be able to do that if the window is invisible to begin with.
   DCHECK(window_visible_);
 
   DCHECK_NE(target_fullscreen_state, target_fullscreen_state_);
   target_fullscreen_state_ = target_fullscreen_state;
@@ skipping 666 matching lines @@
   [bridged_view_ setMouseDownCanMoveWindow:draggable];
   // AppKit will not update its cache of mouseDownCanMoveWindow unless something
   // changes. Previously we tried adding an NSView and removing it, but for some
   // reason it required reposting the mouse-down event, and didn't always work.
   // Calling the below seems to be an effective solution.
   [window_ setMovableByWindowBackground:NO];
   [window_ setMovableByWindowBackground:YES];
 }
 
 }  // namespace views