Reland Fix Views web-modal dialog widget creation.

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

 // Copyright 2014 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/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"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/scroll_view.h"
@@ skipping 34 matching lines @@
   SetBounds(x(), y(), width, height);
 
   views::View::Layout();
 }
 
 }  // namespace
 
 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() {}
 
 void MediaGalleriesScanResultDialogViews::InitChildViews() {
   // Outer dialog layout.
   contents_->RemoveAllChildViews(true);
   int dialog_content_width = views::Widget::GetLocalizedContentsWidth(
       IDS_MEDIA_GALLERIES_DIALOG_CONTENT_WIDTH_CHARS);
   views::GridLayout* layout = views::GridLayout::CreatePanel(contents_);
@@ skipping 114 matching lines @@
 }
 
 base::string16 MediaGalleriesScanResultDialogViews::GetDialogButtonLabel(
     ui::DialogButton button) const {
   return l10n_util::GetStringUTF16(button == ui::DIALOG_BUTTON_OK ?
       IDS_MEDIA_GALLERIES_SCAN_RESULT_DIALOG_CONFIRM :
       IDS_MEDIA_GALLERIES_DIALOG_CANCEL);
 }
 
 ui::ModalType MediaGalleriesScanResultDialogViews::GetModalType() const {
-#if defined(USE_ASH)
   return ui::MODAL_TYPE_CHILD;
-#else
-  return views::WidgetDelegate::GetModalType();
-#endif
 }
 
 bool MediaGalleriesScanResultDialogViews::Cancel() {
   return true;
 }
 
 bool MediaGalleriesScanResultDialogViews::Accept() {
   accepted_ = true;
-
   return true;
 }
 
 void MediaGalleriesScanResultDialogViews::ButtonPressed(
     views::Button* sender,
     const ui::Event& event) {
   GetWidget()->client_view()->AsDialogClientView()->UpdateDialogButtons();
 
   for (GalleryViewMap::const_iterator it = gallery_view_map_.begin();
        it != gallery_view_map_.end(); ++it) {
@@ skipping 53 matching lines @@
       web_contents_modal_dialog_manager).CloseAllDialogs();
 }
 
 // MediaGalleriesScanResultDialogViewsController -------------------------------
 
 // static
 MediaGalleriesScanResultDialog* MediaGalleriesScanResultDialog::Create(
     MediaGalleriesScanResultDialogController* controller) {
   return new MediaGalleriesScanResultDialogViews(controller);
 }