Reland Fix Views web-modal dialog widget creation.

chrome/browser/ui/views/pdf_password_dialog.cc

 // Copyright 2013 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/pdf/pdf_tab_helper.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 "chrome/browser/ui/views/constrained_window_views.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/message_box_view.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
 namespace {
 
-// PDFPasswordDialogViews runs a tab-modal dialog that asks the user for a
-// password.
+// Runs a tab-modal dialog that asks the user for a password.
 class PDFPasswordDialogViews : public views::DialogDelegate {
  public:
   PDFPasswordDialogViews(content::WebContents* web_contents,
                          const base::string16& prompt,
                          const PasswordDialogClosedCallback& callback);
   virtual ~PDFPasswordDialogViews();
 
   // views::DialogDelegate:
   virtual base::string16 GetWindowTitle() const OVERRIDE;
   virtual base::string16 GetDialogButtonLabel(
       ui::DialogButton button) const OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
   // views::WidgetDelegate:
   virtual views::View* GetInitiallyFocusedView() OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
   virtual views::Widget* GetWidget() OVERRIDE;
   virtual const views::Widget* GetWidget() const OVERRIDE;
   virtual void DeleteDelegate() OVERRIDE;
   virtual ui::ModalType GetModalType() const OVERRIDE;
 
  private:
   // The message box view whose commands we handle.
   views::MessageBoxView* message_box_view_;
 
-  views::Widget* dialog_;
-
   PasswordDialogClosedCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(PDFPasswordDialogViews);
 };
 
 PDFPasswordDialogViews::PDFPasswordDialogViews(
     content::WebContents* web_contents,
     const base::string16& prompt,
     const PasswordDialogClosedCallback& callback)
     : message_box_view_(NULL),
-      dialog_(NULL),
       callback_(callback) {
   views::MessageBoxView::InitParams init_params(prompt);
   init_params.options = views::MessageBoxView::HAS_PROMPT_FIELD;
   init_params.inter_row_vertical_spacing =
       views::kUnrelatedControlVerticalSpacing;
   message_box_view_ = new views::MessageBoxView(init_params);
   message_box_view_->text_box()->SetTextInputType(ui::TEXT_INPUT_TYPE_PASSWORD);
-
-  web_modal::WebContentsModalDialogManager* web_contents_modal_dialog_manager =
-      web_modal::WebContentsModalDialogManager::FromWebContents(web_contents);
-  web_modal::WebContentsModalDialogManagerDelegate* modal_delegate =
-      web_contents_modal_dialog_manager->delegate();
-  DCHECK(modal_delegate);
-  dialog_ = views::Widget::CreateWindowAsFramelessChild(
-      this, modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
-  web_contents_modal_dialog_manager->ShowModalDialog(
-      dialog_->GetNativeView());
+  ShowWebModalDialogViews(this, web_contents);
 }
 
 PDFPasswordDialogViews::~PDFPasswordDialogViews() {
   if (!callback_.is_null()) {
     // This dialog was torn down without either OK or cancel being clicked; be
     // considerate and at least do the callback.
     callback_.Run(false, base::string16());
   }
 }
 
@@ skipping 42 matching lines @@
 
 const views::Widget* PDFPasswordDialogViews::GetWidget() const {
   return message_box_view_->GetWidget();
 }
 
 void PDFPasswordDialogViews::DeleteDelegate() {
   delete this;
 }
 
 ui::ModalType PDFPasswordDialogViews::GetModalType() const {
-#if defined(USE_ASH)
   return ui::MODAL_TYPE_CHILD;
-#else
-  return views::WidgetDelegate::GetModalType();
-#endif
 }
 
 }  // namespace
 
 void ShowPDFPasswordDialog(content::WebContents* web_contents,
                            const base::string16& prompt,
                            const PasswordDialogClosedCallback& callback) {
   new PDFPasswordDialogViews(web_contents, prompt, callback);
 }