Reland Fix Views web-modal dialog widget creation.

chrome/browser/ui/views/download/download_danger_prompt_views.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 "base/compiler_specific.h"
 #include "chrome/browser/download/download_danger_prompt.h"
 #include "chrome/browser/download/download_stats.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/browser_thread.h"
 #include "content/public/browser/download_danger_type.h"
 #include "content/public/browser/download_item.h"
-#include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 #include "ui/views/window/dialog_delegate.h"
 
-using content::BrowserThread;
-using web_modal::WebContentsModalDialogManager;
-using web_modal::WebContentsModalDialogManagerDelegate;
-
 namespace {
 
 const int kMessageWidth = 320;
 const int kParagraphPadding = 15;
 
 // Views-specific implementation of download danger prompt dialog. We use this
 // class rather than a TabModalConfirmDialog so that we can use custom
 // formatting on the text in the body of the dialog.
 class DownloadDangerPromptViews : public DownloadDangerPrompt,
                                   public content::DownloadItem::Observer,
                                   public views::DialogDelegate {
  public:
   DownloadDangerPromptViews(content::DownloadItem* item,
-                            content::WebContents* web_contents,
                             bool show_context,
                             const OnDone& done);
 
   // DownloadDangerPrompt methods:
   virtual void InvokeActionForTesting(Action action) OVERRIDE;
 
   // views::DialogDelegate methods:
   virtual base::string16 GetDialogButtonLabel(
       ui::DialogButton button) const OVERRIDE;
   virtual base::string16 GetWindowTitle() const OVERRIDE;
@@ skipping 20 matching lines @@
 
   content::DownloadItem* download_;
   bool show_context_;
   OnDone done_;
 
   views::View* contents_view_;
 };
 
 DownloadDangerPromptViews::DownloadDangerPromptViews(
     content::DownloadItem* item,
-    content::WebContents* web_contents,
     bool show_context,
     const OnDone& done)
     : download_(item),
       show_context_(show_context),
       done_(done),
       contents_view_(NULL) {
   DCHECK(!done_.is_null());
   download_->AddObserver(this);
 
   contents_view_ = new views::View;
@@ skipping 55 matching lines @@
     ui::DialogButton button) const {
   switch (button) {
     case ui::DIALOG_BUTTON_OK:
       return GetAcceptButtonTitle();
 
     case ui::DIALOG_BUTTON_CANCEL:
       return GetCancelButtonTitle();
 
     default:
       return DialogDelegate::GetDialogButtonLabel(button);
-  };
+  }
 }
 
 base::string16 DownloadDangerPromptViews::GetWindowTitle() const {
   if (show_context_)
     return l10n_util::GetStringUTF16(IDS_CONFIRM_KEEP_DANGEROUS_DOWNLOAD_TITLE);
   else
     return l10n_util::GetStringUTF16(IDS_RESTORE_KEEP_DANGEROUS_DOWNLOAD_TITLE);
 }
 
 void DownloadDangerPromptViews::DeleteDelegate() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   delete this;
 }
 
 ui::ModalType DownloadDangerPromptViews::GetModalType() const {
-#if defined(USE_ASH)
   return ui::MODAL_TYPE_CHILD;
-#else
-  return views::WidgetDelegate::GetModalType();
-#endif
 }
 
 bool DownloadDangerPromptViews::Cancel() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   RunDone(CANCEL);
   return true;
 }
 
 bool DownloadDangerPromptViews::Accept() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   RunDone(ACCEPT);
   return true;
 }
 
 bool DownloadDangerPromptViews::Close() {
-  DCHECK_CURRENTLY_ON(BrowserThread::UI);
-
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   RunDone(DISMISS);
   return true;
 }
 
 views::View* DownloadDangerPromptViews::GetInitiallyFocusedView() {
   return GetDialogClientView()->cancel_button();
 }
 
 views::View* DownloadDangerPromptViews::GetContentsView() {
   return contents_view_;
@@ skipping 128 matching lines @@
 }
 
 }  // namespace
 
 DownloadDangerPrompt* DownloadDangerPrompt::Create(
     content::DownloadItem* item,
     content::WebContents* web_contents,
     bool show_context,
     const OnDone& done) {
   DownloadDangerPromptViews* download_danger_prompt =
-      new DownloadDangerPromptViews(item, web_contents, show_context, done);
-
-  WebContentsModalDialogManager* web_contents_modal_dialog_manager =
-      WebContentsModalDialogManager::FromWebContents(web_contents);
-  WebContentsModalDialogManagerDelegate* modal_delegate =
-      web_contents_modal_dialog_manager->delegate();
-  CHECK(modal_delegate);
-  views::Widget* dialog = views::Widget::CreateWindowAsFramelessChild(
-      download_danger_prompt,
-      modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
-  web_contents_modal_dialog_manager->ShowModalDialog(
-      dialog->GetNativeView());
-
+      new DownloadDangerPromptViews(item, show_context, done);
+  ShowWebModalDialogViews(download_danger_prompt, web_contents);
   return download_danger_prompt;
 }