MacViews: Exploring removal of window-modal sheets.

components/constrained_window/constrained_window_views.cc

 // Copyright (c) 2012 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 "components/constrained_window/constrained_window_views.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "build/build_config.h"
@@ skipping 69 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(WidgetModalDialogHostObserverViews);
 };
 
 void UpdateModalDialogPosition(views::Widget* widget,
                                web_modal::ModalDialogHost* dialog_host,
                                const gfx::Size& size) {
   // Do not forcibly update the dialog widget position if it is being dragged.
   if (widget->HasCapture())
     return;
 
-  views::Widget* host_widget =
-      views::Widget::GetWidgetForNativeView(dialog_host->GetHostView());
-
-  // If the host view is not backed by a Views::Widget, just update the widget
-  // size. This can happen on MacViews under the Cocoa browser where the window
-  // modal dialogs are displayed as sheets, and their position is managed by a
-  // ConstrainedWindowSheetController instance.
-  if (!host_widget) {
-    widget->SetSize(size);
-    return;
-  }
-
   gfx::Point position = dialog_host->GetDialogPosition(size);
   views::Border* border = widget->non_client_view()->frame_view()->border();
   // Border may be null during widget initialization.
   if (border) {
     // Align the first row of pixels inside the border. This is the apparent
     // top of the dialog.
     position.set_y(position.y() - border->GetInsets().top());
   }
 
   if (widget->is_top_level())
-    position += host_widget->GetClientAreaBoundsInScreen().OffsetFromOrigin();
+    position += dialog_host->GetHostPosition().OffsetFromOrigin();
 
   widget->SetBounds(gfx::Rect(position, size));
 }
 
 }  // namespace
 
 // static
 void SetConstrainedWindowViewsClient(
     std::unique_ptr<ConstrainedWindowViewsClient> new_client) {
   delete constrained_window_views_client;
@@ skipping 79 matching lines @@
   DCHECK_NE(ui::MODAL_TYPE_NONE, dialog->GetModalType());
   DCHECK(!parent || constrained_window_views_client);
 
   gfx::NativeView parent_view =
       parent ? constrained_window_views_client->GetDialogHostView(parent)
              : nullptr;
   views::Widget* widget =
       views::DialogDelegate::CreateDialogWidget(dialog, nullptr, parent_view);
 
   bool requires_positioning = dialog->ShouldUseCustomFrame();
-
-#if defined(OS_MACOSX)
-  // On Mac, window modal dialogs are displayed as sheets, so their position is
-  // managed by the parent window.
-  requires_positioning = false;
-#endif
-
   if (!requires_positioning)
     return widget;
 
   ModalDialogHost* host =
       parent ? constrained_window_views_client->GetModalDialogHost(parent)
              : nullptr;
   if (host) {
+#if !defined(OS_MACOSX)
+    // On Mac, the host view for tab-modal dialogs may differ from the host view
+    // for window-modal dialogs. There is only one ModalDialogHost per window,
+    // designed for tab-modal dialogs, but suitable for positioning window-
+    // modal dialogs as well.
+    // On other platforms, the gfx::NativeView should match.
     DCHECK_EQ(parent_view, host->GetHostView());
+#endif
     ModalDialogHostObserver* dialog_host_observer =
         new WidgetModalDialogHostObserverViews(
             host, widget, kWidgetModalDialogHostObserverViewsKey);
     dialog_host_observer->OnPositionRequiresUpdate();
   }
   return widget;
 }
 
 }  // namespace constrained window