Reland Fix Views web-modal dialog widget creation.

chrome/browser/ui/views/extensions/media_galleries_dialog_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/views/extensions/media_galleries_dialog_views.h"
 
 #include "base/strings/utf_string_conversions.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/native_theme/native_theme.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 
-using web_modal::WebContentsModalDialogManager;
-using web_modal::WebContentsModalDialogManagerDelegate;
-
 namespace {
 
 const int kScrollAreaHeight = 192;
 
 // This container has the right Layout() impl to use within a ScrollView.
 class ScrollableView : public views::View {
  public:
   ScrollableView() {}
   virtual ~ScrollableView() {}
 
@@ skipping 17 matching lines @@
 }
 
 }  // namespace
 
 typedef MediaGalleriesDialogController::GalleryPermissionsVector
     GalleryPermissionsVector;
 
 MediaGalleriesDialogViews::MediaGalleriesDialogViews(
     MediaGalleriesDialogController* controller)
     : controller_(controller),
-      window_(NULL),
       contents_(new views::View()),
       add_gallery_button_(NULL),
       confirm_available_(false),
       accepted_(false) {
   InitChildViews();
-
-  if (ControllerHasWebContents()) {
-    // Ownership of |contents_| is handed off by this call. |window_| will take
-    // care of deleting itself after calling DeleteDelegate().
-    WebContentsModalDialogManager* web_contents_modal_dialog_manager =
-        WebContentsModalDialogManager::FromWebContents(
-            controller->web_contents());
-    DCHECK(web_contents_modal_dialog_manager);
-    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());
-  }
+  if (ControllerHasWebContents())
+    ShowWebModalDialogViews(this, controller->web_contents());
 }
 
 MediaGalleriesDialogViews::~MediaGalleriesDialogViews() {
   if (!ControllerHasWebContents())
     delete contents_;
 }
 
 void MediaGalleriesDialogViews::InitChildViews() {
   // Outer dialog layout.
   contents_->RemoveAllChildViews(true);
@@ skipping 147 matching lines @@
       IDS_MEDIA_GALLERIES_DIALOG_CONFIRM :
       IDS_MEDIA_GALLERIES_DIALOG_CANCEL);
 }
 
 bool MediaGalleriesDialogViews::IsDialogButtonEnabled(
     ui::DialogButton button) const {
   return button != ui::DIALOG_BUTTON_OK || confirm_available_;
 }
 
 ui::ModalType MediaGalleriesDialogViews::GetModalType() const {
-#if defined(USE_ASH)
   return ui::MODAL_TYPE_CHILD;
-#else
-  return views::WidgetDelegate::GetModalType();
-#endif
 }
 
 views::View* MediaGalleriesDialogViews::CreateExtraView() {
   DCHECK(!add_gallery_button_);
   add_gallery_button_ = new views::LabelButton(this,
       l10n_util::GetStringUTF16(IDS_MEDIA_GALLERIES_DIALOG_ADD_GALLERY));
   add_gallery_button_->SetStyle(views::Button::STYLE_BUTTON);
   return add_gallery_button_;
 }
 
 bool MediaGalleriesDialogViews::Cancel() {
   return true;
 }
 
 bool MediaGalleriesDialogViews::Accept() {
   accepted_ = true;
-
   return true;
 }
 
 void MediaGalleriesDialogViews::ButtonPressed(views::Button* sender,
                                               const ui::Event& /* event */) {
   confirm_available_ = true;
 
   if (ControllerHasWebContents())
     GetWidget()->client_view()->AsDialogClientView()->UpdateDialogButtons();
 
@@ skipping 47 matching lines @@
   return controller_->web_contents() != NULL;
 }
 
 // MediaGalleriesDialogViewsController -----------------------------------------
 
 // static
 MediaGalleriesDialog* MediaGalleriesDialog::Create(
     MediaGalleriesDialogController* controller) {
   return new MediaGalleriesDialogViews(controller);
 }