Place browser-modal dialogs like web-contents-modal dialogs.

chrome/browser/ui/views/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 "chrome/browser/ui/views/constrained_window_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_properties.h"
+#include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/theme_image_mapper.h"
 #include "chrome/common/chrome_constants.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/chromium_strings.h"
@@ skipping 94 matching lines @@
     gfx::Size size = target_widget_->GetWindowBoundsInScreen().size();
     gfx::Point position = host_->GetDialogPosition(size);
     views::Border* border =
         target_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 (target_widget_->is_top_level())
+      position += views::Widget::GetWidgetForNativeView(host_->GetHostView())->
+          GetClientAreaBoundsInScreen().OffsetFromOrigin();
+
     target_widget_->SetBounds(gfx::Rect(position, size));
   }
 
  private:
   WebContentsModalDialogHost* host_;
   views::Widget* target_widget_;
   const char* const native_window_property_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsModalDialogHostObserverViews);
 };
@@ skipping 534 matching lines @@
 
   if (dialog_host_observer) {
     dialog_host_observer->OnPositionRequiresUpdate();
     dialog->SetNativeWindowProperty(kWebContentsModalDialogHostObserverViewsKey,
                                     dialog_host_observer);
   }
 
   return dialog;
 }
 
+views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog,
+                                             gfx::NativeWindow parent) {
+  views::Widget* widget =
+      views::DialogDelegate::CreateDialogWidget(dialog, NULL, parent);
+  if (!dialog->UseNewStyleForThisDialog())
+    return widget;
+
+  // Get the browser dialog management and hosting components from |parent|.
+  Browser* browser = chrome::FindBrowserWithWindow(parent);
+  if (browser) {

[Mike Wittman, 2013/06/07 02:38:03]

How about DCHECK(browser)?  Wouldn't invoking this function with a non-browser
parent window be a coding error? 

[msw, 2013/06/07 17:51:13]

I'm not so sure, take a look at the parent wrangling in network_config_view.cc.

+    ChromeWebModalDialogManagerDelegate* manager = browser;
+    WebContentsModalDialogHost* host = manager->GetWebContentsModalDialogHost();
+    DCHECK_EQ(parent, host->GetHostView());
+    WebContentsModalDialogHostObserver* dialog_host_observer =
+        new WebContentsModalDialogHostObserverViews(
+            host, widget, kWebContentsModalDialogHostObserverViewsKey);
+    dialog_host_observer->OnPositionRequiresUpdate();
+  }
+  return widget;
+}
+
 views::NonClientFrameView* CreateConstrainedStyleNonClientFrameView(
     views::Widget* widget,
     content::BrowserContext* browser_context) {
   if (views::DialogDelegate::UseNewStyle()) {
 #if defined(USE_AURA)
     const bool force_opaque_border = false;
 #else
     const bool force_opaque_border = true;
 #endif
     return views::DialogDelegate::CreateNewStyleFrameView(widget,
                                                           force_opaque_border);
   }
 #if defined(USE_ASH)
   ConstrainedWindowFrameViewAsh* frame = new ConstrainedWindowFrameViewAsh;
   frame->Init(widget);
   return frame;
 #endif
   return new ConstrainedWindowFrameView(widget,
                                         browser_context->IsOffTheRecord());
 }