MacViews: Implement Window-modal dialogs using sheets

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 "base/logging.h"
 #include "base/mac/mac_util.h"
@@ skipping 69 matching lines @@
       [[ViewsNSWindowDelegate alloc] initWithBridgedNativeWidget:this]);
 }
 
 BridgedNativeWidget::~BridgedNativeWidget() {
   RemoveOrDestroyChildren();
   DCHECK(child_windows_.empty());
   SetFocusManager(NULL);
   SetRootView(NULL);
   DestroyCompositor();
   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_->GetWidget()->IsModal());
+
     // If the delegate is still set, it means OnWindowWillClose has not been
     // called and the window is still open. Calling -[NSWindow close] will
     // synchronously call OnWindowWillClose and notify NativeWidgetMac.
     [window_ close];
   }
   DCHECK(![window_ delegate]);
 }
 
 void BridgedNativeWidget::Init(base::scoped_nsobject<NSWindow> window,
                                const Widget::InitParams& params) {
@@ skipping 73 matching lines @@
     focus_manager->AddFocusChangeListener(this);
 
   focus_manager_ = focus_manager;
 }
 
 void BridgedNativeWidget::SetBounds(const gfx::Rect& new_bounds) {
   // A contentRect with zero width or height is a banned practice in ChromeMac,
   // due to unpredictable OSX treatment.
   DCHECK(!new_bounds.IsEmpty()) << "Zero-sized windows not supported on Mac";
 
+  if (native_widget_mac_->GetWidget()->IsModal()) {
+    // Modal dialogs are positioned by Cocoa. Just update the size.
+    [window_
+        setContentSize:NSMakeSize(new_bounds.width(), new_bounds.height())];
+    return;
+  }
+
   gfx::Rect actual_new_bounds(new_bounds);
 
   if (parent_ &&
       !PositionWindowInScreenCoordinates(native_widget_mac_->GetWidget(),
                                          widget_type_))
     actual_new_bounds.Offset(parent_->GetRestoredBounds().OffsetFromOrigin());
 
   [window_ setFrame:gfx::ScreenRectToNSRect(actual_new_bounds)
             display:YES
             animate:NO];
@@ skipping 39 matching lines @@
   DCHECK(wants_to_be_visible_);
 
   // If there's a hidden ancestor, return and wait for it to become visible.
   for (BridgedNativeWidget* ancestor = parent();
        ancestor;
        ancestor = ancestor->parent()) {
     if (!ancestor->window_visible_)
       return;
   }
 
+  if (native_widget_mac_->GetWidget()->IsModal()) {
+    NSWindow* parent_window = parent_->ns_window();
+    DCHECK(parent_window);
+
+    [NSApp beginSheet:window_
+        modalForWindow:parent_window
+         modalDelegate:[window_ delegate]
+        didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:)
+           contextInfo:nullptr];
+    return;
+  }
+
   if (new_state == SHOW_AND_ACTIVATE_WINDOW) {
     [window_ makeKeyAndOrderFront:nil];
     [NSApp activateIgnoringOtherApps:YES];
   } else {
     // ui::SHOW_STATE_INACTIVE is typically used to avoid stealing focus from a
     // parent window. So, if there's a parent, order above that. Otherwise, this
     // will order above all windows at the same level.
     NSInteger parent_window_number = 0;
     if (parent())
       parent_window_number = [parent()->ns_window() windowNumber];
@@ skipping 191 matching lines @@
   if (layer())
     UpdateLayerProperties();
 }
 
 void BridgedNativeWidget::OnWindowKeyStatusChangedTo(bool is_key) {
   Widget* widget = native_widget_mac()->GetWidget();
   widget->OnNativeWidgetActivationChanged(is_key);
   // The contentView is the BridgedContentView hosting the views::RootView. The
   // focus manager will already know if a native subview has focus.
   if ([window_ contentView] == [window_ firstResponder]) {
-    if (is_key)
+    if (is_key) {
+      widget->OnNativeFocus();
       widget->GetFocusManager()->RestoreFocusedView();
-    else
+    } else {
+      widget->OnNativeBlur();
       widget->GetFocusManager()->StoreFocusedView(true);
+    }
   }
 }
 
 InputMethod* BridgedNativeWidget::CreateInputMethod() {
   if (switches::IsTextInputFocusManagerEnabled())
     return new NullInputMethod();
 
   return new InputMethodBridge(this, GetHostInputMethod(), true);
 }
 
@@ skipping 286 matching lines @@
       window_, &kWindowPropertiesKey);
   if (!properties) {
     properties = [NSMutableDictionary dictionary];
     objc_setAssociatedObject(window_, &kWindowPropertiesKey,
                              properties, OBJC_ASSOCIATION_RETAIN);
   }
   return properties;
 }
 
 }  // namespace views