Factor out uses of the WebContentsModalDialog interface from platform-independent code

chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc

Index: chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc
diff --git a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc
index a305ddf074a1627a673891e18b3f6967ce7bcaa4..2134c27c41744c5884bc050e4df2d1bb8439818c 100644
--- a/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc
+++ b/chrome/browser/ui/webui/constrained_web_dialog_delegate_base.cc
@@ -25,7 +25,6 @@ ConstrainedWebDialogDelegateBase::ConstrainedWebDialogDelegateBase(
     : WebDialogWebContentsDelegate(browser_context,
                                    new ChromeWebContentsHandler),
       web_dialog_delegate_(delegate),
-      window_(NULL),
       closed_via_webui_(false),
       release_contents_on_close_(false) {
   CHECK(delegate);
@@ -63,12 +62,7 @@ WebDialogDelegate*
 
 void ConstrainedWebDialogDelegateBase::OnDialogCloseFromWebUI() {
   closed_via_webui_ = true;
-  window_->CloseWebContentsModalDialog();
-}
-
-void ConstrainedWebDialogDelegateBase::set_window(
-    WebContentsModalDialog* window) {
-  window_ = window;
+  CloseContents(web_contents_.get());
 }
 
 bool ConstrainedWebDialogDelegateBase::closed_via_webui() const {
@@ -79,8 +73,10 @@ void ConstrainedWebDialogDelegateBase::ReleaseWebContentsOnDialogClose() {
   release_contents_on_close_ = true;
 }
 
-WebContentsModalDialog* ConstrainedWebDialogDelegateBase::GetWindow() {
-  return window_;
+NativeWebContentsModalDialog
+    ConstrainedWebDialogDelegateBase::GetNativeDialog() {
+  NOTREACHED();
+  return NULL;
 }
 
 WebContents* ConstrainedWebDialogDelegateBase::GetWebContents() {