Reland Fix Views web-modal dialog widget creation.

chrome/browser/ui/views/constrained_window_views.h

Index: chrome/browser/ui/views/constrained_window_views.h
diff --git a/chrome/browser/ui/views/constrained_window_views.h b/chrome/browser/ui/views/constrained_window_views.h
index aae0ae1385e4c274e3e2fd62c843dda7d9f7a1e1..8b919e1705b74181f67df50ec9999a1a861f4ff0 100644
--- a/chrome/browser/ui/views/constrained_window_views.h
+++ b/chrome/browser/ui/views/constrained_window_views.h
@@ -7,9 +7,14 @@
 
 #include "ui/gfx/native_widget_types.h"
 
+namespace content {
+class WebContents;
+}
+
 namespace views {
 class DialogDelegate;
 class Widget;
+class WidgetDelegate;
 }
 
 namespace web_modal {
@@ -27,6 +32,14 @@ void UpdateBrowserModalDialogPosition(
     views::Widget* widget,
     web_modal::ModalDialogHost* dialog_host);
 
+// Calls CreateWebModalDialogViews, shows the dialog, and returns its widget.
+views::Widget* ShowWebModalDialogViews(views::WidgetDelegate* dialog,
+                                       content::WebContents* web_contents);
+
+// Create a widget for |dialog| that is modal to |web_contents|.
+views::Widget* CreateWebModalDialogViews(views::WidgetDelegate* dialog,
+                                         content::WebContents* web_contents);
+
 // Create a widget for |dialog| that is modal to the browser window |parent|.
 // This places the dialog appropriately if |parent| is a valid browser window.
 views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog,