[MacViews] Position modal sheets using ModalDialogHost.

chrome/browser/ui/views/frame/browser_frame_mac.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.
 
 #include "chrome/browser/ui/views/frame/browser_frame_mac.h"
 
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_shutdown.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #import "chrome/browser/ui/views/frame/native_widget_mac_frameless_nswindow.h"
+#include "components/web_modal/web_contents_modal_dialog_host.h"
 #import "ui/base/cocoa/window_size_constants.h"
 
 BrowserFrameMac::BrowserFrameMac(BrowserFrame* browser_frame,
                                  BrowserView* browser_view)
     : views::NativeWidgetMac(browser_frame),
       browser_view_(browser_view) {
 }
 
 BrowserFrameMac::~BrowserFrameMac() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserFrameMac, views::NativeWidgetMac implementation:
 
 void BrowserFrameMac::OnWindowWillClose() {
   // Destroy any remaining WebContents early on. This is consistent with Aura.
   // See comment in DesktopBrowserFrameAura::OnHostClosed().
   DestroyBrowserWebContents(browser_view_->browser());
   NativeWidgetMac::OnWindowWillClose();
 }
 
+int BrowserFrameMac::SheetPositionY() {
+  web_modal::WebContentsModalDialogHost* dialog_host =
+      browser_view_->GetWebContentsModalDialogHost();
+  NSView* host_view = dialog_host->GetHostView();
+  // Get the position of the host view relative to the window since
+  // ModalDialogHost::GetDialogPosition is relative to the host view.

[tapted, 2015/08/26 07:27:48]

nit: GetDialogPosition()

[jackhou1, 2015/08/27 05:38:09]

Done.

+  int host_view_y =
+      NSHeight([[host_view window] frame]) - NSMaxY([host_view frame]);

[tapted, 2015/08/26 07:27:48]

So I think this assumes host_view is the contentView (i.e. its frame is in the
same coordinate space as the window bounds), which might not be the case... I.e.
this only works if |dialog_host| and all its parent views are positioned at
(0,0) in their respective parents.

The idiomatic way to do this is something like

NSPoint pointInHost = flip([host_view frame],
dialog_host->GetDialogPosition(gfx::Size());
NSPoint pointInWindow = [host_view convertPoint:pointInHost toView:nil];
return gfx::Point(flip([window frame], pointInWindow)).y();

But.. I guess that's a bit horrible. If you don't like it, perhaps comment about
the assumption, and do something like

DCHECK_EQ(0, NSMinY([host_view frame]);  // Actually all the parents must be at
0 as well.
int height_delta = NSHeight([[host_view window] frame]) - NSHeight([host_view
frame]);

i.e. make it clear that it's only necessary to concern ourselves with the
difference in the heights of the host view and the window.

[jackhou1, 2015/08/27 05:38:09]

Changed to use -convertPoint to get the host_view's top edge.

+  return host_view_y + dialog_host->GetDialogPosition(gfx::Size()).y();
+}
+
 void BrowserFrameMac::InitNativeWidget(
     const views::Widget::InitParams& params) {
   views::NativeWidgetMac::InitNativeWidget(params);
 
   // Our content view draws on top of the titlebar area, but we want the window
   // control buttons to draw on top of the content view.
   // We do this by setting the content view's z-order below the buttons, and
   // by giving the root view a layer so that the buttons get their own layers.
   NSView* content_view = [GetNativeWindow() contentView];
   NSView* root_view = [content_view superview];
@@ skipping 38 matching lines @@
 void BrowserFrameMac::GetWindowPlacement(
     gfx::Rect* bounds,
     ui::WindowShowState* show_state) const {
   return NativeWidgetMac::GetWindowPlacement(bounds, show_state);
 }
 
 int BrowserFrameMac::GetMinimizeButtonOffset() const {
   NOTIMPLEMENTED();
   return 0;
 }