[UI] Make auto-resizable constrained web dialog work even when initiated

chrome/browser/ui/views/constrained_web_dialog_delegate_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/webui/constrained_web_dialog_delegate_base.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/browser_finder.h"
@@ skipping 62 matching lines @@
                              const gfx::Size& preferred_size) override {
     if (source != web_view_->GetWebContents())
       return;
 
     if (!initiator_observer_->web_contents())
       return;
 
     // Sets WebView's preferred size based on auto-resized contents.
     web_view_->SetPreferredSize(preferred_size);
 
-    constrained_window::UpdateWebContentsModalDialogPosition(
-        web_view_->GetWidget(),
-        web_modal::WebContentsModalDialogManager::FromWebContents(
-            initiator_observer_->web_contents())->delegate()->
-                GetWebContentsModalDialogHost());
+    content::WebContents* top_level_web_contents =
+        constrained_window::GetTopLevelWebContents(
+            initiator_observer_->web_contents());
+    if (top_level_web_contents) {
+      constrained_window::UpdateWebContentsModalDialogPosition(
+          web_view_->GetWidget(),
+          web_modal::WebContentsModalDialogManager::FromWebContents(
+              top_level_web_contents)
+              ->delegate()
+              ->GetWebContentsModalDialogHost());
+    }
   }
 
  private:
   InitiatorWebContentsObserver* const initiator_observer_;
   views::WebView* web_view_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDialogWebContentsDelegateViews);
 };
 
 class ConstrainedWebDialogDelegateViews
@@ skipping 133 matching lines @@
     if (!max_size_.IsEmpty())
       EnableAutoResize();
   }
   void RenderViewHostChanged(content::RenderViewHost* old_host,
                              content::RenderViewHost* new_host) override {
     if (!max_size_.IsEmpty())
       EnableAutoResize();
   }
   void DocumentOnLoadCompletedInMainFrame() override {
     if (!max_size_.IsEmpty() && initiator_observer_.web_contents()) {
-      constrained_window::ShowModalDialog(GetWidget()->GetNativeWindow(),
-                                          initiator_observer_.web_contents());
+      content::WebContents* top_level_web_contents =
+          constrained_window::GetTopLevelWebContents(
+              initiator_observer_.web_contents());
+      if (top_level_web_contents) {
+        constrained_window::ShowModalDialog(GetWidget()->GetNativeWindow(),
+                                            top_level_web_contents);
+      }
     }
   }
 
  private:
   void EnableAutoResize() {
     content::RenderViewHost* render_view_host =
         GetWebContents()->GetRenderViewHost();
     render_view_host->EnableAutoResize(min_size_, max_size_);
   }
 
@@ skipping 27 matching lines @@
     ui::WebDialogDelegate* delegate,
     content::WebContents* web_contents,
     const gfx::Size& min_size,
     const gfx::Size& max_size) {
   DCHECK(!min_size.IsEmpty());
   DCHECK(!max_size.IsEmpty());
   ConstrainedWebDialogDelegateViewViews* dialog =
       new ConstrainedWebDialogDelegateViewViews(
           browser_context, delegate, web_contents,
           min_size, max_size);
-  constrained_window::CreateWebModalDialogViews(dialog, web_contents);
+
+  // For embedded WebContents, use the embedder's WebContents for constrained
+  // window.
+  content::WebContents* top_level_web_contents =
+      constrained_window::GetTopLevelWebContents(web_contents);
+  DCHECK(top_level_web_contents);
+  constrained_window::CreateWebModalDialogViews(dialog, top_level_web_contents);
   return dialog;
 }