Reland Fix Views web-modal dialog widget creation.

chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.cc

Index: chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.cc
diff --git a/chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.cc b/chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.cc
index 792a173c917d1e280aa27b1b80b2e61398de8d7b..733f8b77989a97daab1f0b43184c63d0d139e321 100644
--- a/chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.cc
+++ b/chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.cc
@@ -4,10 +4,9 @@
 
 #include "chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.h"
 
+#include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h"
-#include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
-#include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
@@ -62,24 +61,10 @@ void ScrollableView::Layout() {
 MediaGalleriesScanResultDialogViews::MediaGalleriesScanResultDialogViews(
     MediaGalleriesScanResultDialogController* controller)
     : controller_(controller),
-      window_(NULL),
       contents_(new views::View()),
       accepted_(false) {
   InitChildViews();
-
-  // Ownership of |contents_| is handed off by this call. |window_| will take
-  // care of deleting itself after calling DeleteDelegate().
-  web_modal::WebContentsModalDialogManager* web_contents_modal_dialog_manager =
-      web_modal::WebContentsModalDialogManager::FromWebContents(
-          controller->web_contents());
-  DCHECK(web_contents_modal_dialog_manager);
-  web_modal::WebContentsModalDialogManagerDelegate* modal_delegate =
-      web_contents_modal_dialog_manager->delegate();
-  DCHECK(modal_delegate);
-  window_ = views::Widget::CreateWindowAsFramelessChild(
-      this, modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
-  web_contents_modal_dialog_manager->ShowModalDialog(
-      window_->GetNativeView());
+  ShowWebModalDialogViews(this, controller->web_contents());
 }
 
 MediaGalleriesScanResultDialogViews::~MediaGalleriesScanResultDialogViews() {}
@@ -214,11 +199,7 @@ base::string16 MediaGalleriesScanResultDialogViews::GetDialogButtonLabel(
 }
 
 ui::ModalType MediaGalleriesScanResultDialogViews::GetModalType() const {
-#if defined(USE_ASH)
   return ui::MODAL_TYPE_CHILD;
-#else
-  return views::WidgetDelegate::GetModalType();
-#endif
 }
 
 bool MediaGalleriesScanResultDialogViews::Cancel() {
@@ -227,7 +208,6 @@ bool MediaGalleriesScanResultDialogViews::Cancel() {
 
 bool MediaGalleriesScanResultDialogViews::Accept() {
   accepted_ = true;
-
   return true;
 }