Cleanup: Remove deprecated version of views::CreateDialogFrameView().

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 "chrome/browser/ui/views/constrained_window_views.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/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"
@@ skipping 32 matching lines @@
 
   // views::DialogDelegate methods:
   virtual base::string16 GetDialogButtonLabel(
       ui::DialogButton button) const OVERRIDE;
   virtual base::string16 GetWindowTitle() const OVERRIDE;
   virtual void DeleteDelegate() OVERRIDE;
   virtual ui::ModalType GetModalType() const OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Close() OVERRIDE;
-  // TODO(wittman): Remove this override once we move to the new style frame
-  // view on all dialogs.
-  virtual views::NonClientFrameView* CreateNonClientFrameView(
-      views::Widget* widget) OVERRIDE;
   virtual views::View* GetInitiallyFocusedView() OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
   virtual views::Widget* GetWidget() OVERRIDE;
   virtual const views::Widget* GetWidget() const OVERRIDE;
 
   // content::DownloadItem::Observer:
   virtual void OnDownloadUpdated(content::DownloadItem* download) OVERRIDE;
 
  private:
   base::string16 GetAcceptButtonTitle() const;
   base::string16 GetCancelButtonTitle() const;
   // The message lead is separated from the main text and is bolded.
   base::string16 GetMessageLead() const;
   base::string16 GetMessageBody() const;
   void RunDone(Action action);
 
   content::DownloadItem* download_;
   content::WebContents* web_contents_;

[msw, 2014/02/10 19:21:15]

nit: this member (and its corresponding ctor param) can also be removed.

[Lei Zhang, 2014/02/10 23:21:42]

Done.

   bool show_context_;
   OnDone done_;
 
   views::View* contents_view_;
 };
 
 DownloadDangerPromptViews::DownloadDangerPromptViews(
     content::DownloadItem* item,
     content::WebContents* web_contents,
     bool show_context,
@@ skipping 110 matching lines @@
   return true;
 }
 
 bool DownloadDangerPromptViews::Close() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   RunDone(DISMISS);
   return true;
 }
 
-// TODO(wittman): Remove this override once we move to the new style frame
-// view on all dialogs.
-views::NonClientFrameView* DownloadDangerPromptViews::CreateNonClientFrameView(
-    views::Widget* widget) {
-  return CreateConstrainedStyleNonClientFrameView(
-      widget, web_contents_->GetBrowserContext());
-}
-
 views::View* DownloadDangerPromptViews::GetInitiallyFocusedView() {
   return GetDialogClientView()->cancel_button();
 }
 
 views::View* DownloadDangerPromptViews::GetContentsView() {
   return contents_view_;
 }
 
 views::Widget* DownloadDangerPromptViews::GetWidget() {
   return contents_view_->GetWidget();
@@ skipping 61 matching lines @@
 }
 
 base::string16 DownloadDangerPromptViews::GetMessageBody() const {
   if (show_context_) {
     switch (download_->GetDangerType()) {
       case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE: {
         return l10n_util::GetStringFUTF16(
             IDS_PROMPT_DANGEROUS_DOWNLOAD,
             download_->GetFileNameToReportUser().LossyDisplayName());
       }
-      case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL: // Fall through
+      case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:  // Fall through
       case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
       case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST: {
         return l10n_util::GetStringFUTF16(
             IDS_PROMPT_MALICIOUS_DOWNLOAD_CONTENT,
             download_->GetFileNameToReportUser().LossyDisplayName());
       }
       case content::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT: {
         return l10n_util::GetStringFUTF16(
             IDS_PROMPT_UNCOMMON_DOWNLOAD_CONTENT,
             download_->GetFileNameToReportUser().LossyDisplayName());
@@ skipping 56 matching lines @@
   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->ShowDialog(dialog->GetNativeView());
 
   return download_danger_prompt;
 }