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

Review URL: https://codereview.chromium.org/109623005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250308 0039d316-1c4b-4281-b951-d872f2087c98

20 files changed, 7 insertions, 173 deletions

diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
index 722ca69..827468a 100644
--- a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
+++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
@@ -1631,15 +1631,6 @@ bool AutofillDialogViews::Accept() {
   return false;
 }
 
-// TODO(wittman): Remove this override once we move to the new style frame view
-// on all dialogs.
-views::NonClientFrameView* AutofillDialogViews::CreateNonClientFrameView(
-    views::Widget* widget) {
-  return CreateConstrainedStyleNonClientFrameView(
-      widget,
-      delegate_->GetWebContents()->GetBrowserContext());
-}
-
 void AutofillDialogViews::ContentsChanged(views::Textfield* sender,
                                           const base::string16& new_contents) {
   InputEditedOrActivated(TypeForTextfield(sender),
diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.h b/chrome/browser/ui/views/autofill/autofill_dialog_views.h
index 2a47992..dff142d 100644
--- a/chrome/browser/ui/views/autofill/autofill_dialog_views.h
+++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.h
@@ -120,8 +120,6 @@ class AutofillDialogViews : public AutofillDialogView,
   virtual views::View* CreateFootnoteView() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
-  virtual views::NonClientFrameView* CreateNonClientFrameView(
-      views::Widget* widget) OVERRIDE;
 
   // views::WidgetObserver implementation:
   virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc
index 29f7a21..99ddef9 100644
--- a/chrome/browser/ui/views/collected_cookies_views.cc
+++ b/chrome/browser/ui/views/collected_cookies_views.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
-#include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/views/cookie_info_view.h"
 #include "chrome/common/pref_names.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
@@ -247,15 +246,6 @@ bool CollectedCookiesViews::Cancel() {
   return true;
 }
 
-// TODO(wittman): Remove this override once we move to the new style frame view
-// on all dialogs.
-views::NonClientFrameView* CollectedCookiesViews::CreateNonClientFrameView(
-    views::Widget* widget) {
-  return CreateConstrainedStyleNonClientFrameView(
-      widget,
-      web_contents_->GetBrowserContext());
-}
-
 ui::ModalType CollectedCookiesViews::GetModalType() const {
 #if defined(USE_ASH)
   return ui::MODAL_TYPE_CHILD;
diff --git a/chrome/browser/ui/views/collected_cookies_views.h b/chrome/browser/ui/views/collected_cookies_views.h
index c1ff638..5a62fef 100644
--- a/chrome/browser/ui/views/collected_cookies_views.h
+++ b/chrome/browser/ui/views/collected_cookies_views.h
@@ -51,8 +51,6 @@ class CollectedCookiesViews : public views::DialogDelegateView,
       ui::DialogButton button) const OVERRIDE;
   virtual void DeleteDelegate() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
-  virtual views::NonClientFrameView* CreateNonClientFrameView(
-      views::Widget* widget) OVERRIDE;
   virtual ui::ModalType GetModalType() const OVERRIDE;
 
   // views::ButtonListener:
diff --git a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
index 4646e86..3909361 100644
--- a/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
+++ b/chrome/browser/ui/views/constrained_web_dialog_delegate_views.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h"
 
 #include "base/strings/utf_string_conversions.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"
@@ -130,14 +129,6 @@ class ConstrainedWebDialogDelegateViewViews
   virtual views::View* GetContentsView() OVERRIDE {
     return this;
   }
-  // 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 {
-    return CreateConstrainedStyleNonClientFrameView(
-        widget,
-        GetWebContents()->GetBrowserContext());
-  }
   virtual bool ShouldShowCloseButton() const OVERRIDE {
     // No close button if the dialog doesn't want a title bar.
     return impl_->GetWebDialogDelegate()->ShouldShowDialogTitle();
@@ -199,7 +190,8 @@ ConstrainedWebDialogDelegateViewViews::ConstrainedWebDialogDelegateViewViews(
   AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
 }
 
-ConstrainedWebDialogDelegateViewViews::~ConstrainedWebDialogDelegateViewViews() {
+ConstrainedWebDialogDelegateViewViews::
+~ConstrainedWebDialogDelegateViewViews() {
 }
 
 ConstrainedWebDialogDelegate* CreateConstrainedWebDialog(
diff --git a/chrome/browser/ui/views/constrained_window_views.cc b/chrome/browser/ui/views/constrained_window_views.cc
index b3e5ec5..2bde83c 100644
--- a/chrome/browser/ui/views/constrained_window_views.cc
+++ b/chrome/browser/ui/views/constrained_window_views.cc
@@ -138,13 +138,3 @@ views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog,
   }
   return widget;
 }
-
-views::NonClientFrameView* CreateConstrainedStyleNonClientFrameView(
-    views::Widget* widget,
-    content::BrowserContext* browser_context) {
-  bool force_opaque = true;
-#if defined(USE_AURA)
-  force_opaque = false;
-#endif
-  return views::DialogDelegate::CreateDialogFrameView(widget, force_opaque);
-}
diff --git a/chrome/browser/ui/views/constrained_window_views.h b/chrome/browser/ui/views/constrained_window_views.h
index 3ee2753..aae0ae1 100644
--- a/chrome/browser/ui/views/constrained_window_views.h
+++ b/chrome/browser/ui/views/constrained_window_views.h
@@ -7,15 +7,9 @@
 
 #include "ui/gfx/native_widget_types.h"
 
-namespace content {
-class BrowserContext;
-}
-
 namespace views {
 class DialogDelegate;
-class NonClientFrameView;
 class Widget;
-class WidgetDelegate;
 }
 
 namespace web_modal {
@@ -38,8 +32,4 @@ void UpdateBrowserModalDialogPosition(
 views::Widget* CreateBrowserModalDialogViews(views::DialogDelegate* dialog,
                                              gfx::NativeWindow parent);
 
-views::NonClientFrameView* CreateConstrainedStyleNonClientFrameView(
-    views::Widget* widget,
-    content::BrowserContext* browser_context);
-
 #endif  // CHROME_BROWSER_UI_VIEWS_CONSTRAINED_WINDOW_VIEWS_H_
diff --git a/chrome/browser/ui/views/download/download_danger_prompt_views.cc b/chrome/browser/ui/views/download/download_danger_prompt_views.cc
index 83f917a..233503f 100644
--- a/chrome/browser/ui/views/download/download_danger_prompt_views.cc
+++ b/chrome/browser/ui/views/download/download_danger_prompt_views.cc
@@ -5,7 +5,6 @@
 #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"
@@ -58,10 +57,6 @@ class DownloadDangerPromptViews : public DownloadDangerPrompt,
   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;
@@ -79,7 +74,6 @@ class DownloadDangerPromptViews : public DownloadDangerPrompt,
   void RunDone(Action action);
 
   content::DownloadItem* download_;
-  content::WebContents* web_contents_;
   bool show_context_;
   OnDone done_;
 
@@ -92,7 +86,6 @@ DownloadDangerPromptViews::DownloadDangerPromptViews(
     bool show_context,
     const OnDone& done)
     : download_(item),
-      web_contents_(web_contents),
       show_context_(show_context),
       done_(done),
       contents_view_(NULL) {
@@ -210,14 +203,6 @@ bool DownloadDangerPromptViews::Close() {
   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();
 }
@@ -299,7 +284,7 @@ base::string16 DownloadDangerPromptViews::GetMessageBody() const {
             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(
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
index 46fa4b6..aae115a 100644
--- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
+++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
@@ -5,7 +5,6 @@
 #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 "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"
@@ -317,15 +316,6 @@ bool MediaGalleriesDialogViews::Accept() {
   return true;
 }
 
-// TODO(wittman): Remove this override once we move to the new style frame view
-// on all dialogs.
-views::NonClientFrameView* MediaGalleriesDialogViews::CreateNonClientFrameView(
-    views::Widget* widget) {
-  return CreateConstrainedStyleNonClientFrameView(
-      widget,
-      controller_->web_contents()->GetBrowserContext());
-}
-
 void MediaGalleriesDialogViews::ButtonPressed(views::Button* sender,
                                               const ui::Event& event) {
   confirm_available_ = true;
diff --git a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h
index a57756b..2d5cb03 100644
--- a/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h
+++ b/chrome/browser/ui/views/extensions/media_galleries_dialog_views.h
@@ -47,8 +47,6 @@ class MediaGalleriesDialogViews : public MediaGalleriesDialog,
   virtual views::View* CreateExtraView() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
-  virtual views::NonClientFrameView* CreateNonClientFrameView(
-      views::Widget* widget) OVERRIDE;
 
   // views::ButtonListener implementation:
   virtual void ButtonPressed(views::Button* sender,
diff --git a/chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.cc b/chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.cc
index b819fd0..cf8c6ad 100644
--- a/chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.cc
+++ b/chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.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"
@@ -274,16 +273,6 @@ bool MediaGalleriesScanResultDialogViews::Accept() {
   return true;
 }
 
-// TODO(wittman): Remove this override once we move to the new style frame view
-// on all dialogs.
-views::NonClientFrameView*
-MediaGalleriesScanResultDialogViews::CreateNonClientFrameView(
-    views::Widget* widget) {
-  return CreateConstrainedStyleNonClientFrameView(
-      widget,
-      controller_->web_contents()->GetBrowserContext());
-}
-
 void MediaGalleriesScanResultDialogViews::ButtonPressed(
     views::Button* sender,
     const ui::Event& event) {
diff --git a/chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.h b/chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.h
index cc16b48..6970086 100644
--- a/chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.h
+++ b/chrome/browser/ui/views/extensions/media_galleries_scan_result_dialog_views.h
@@ -47,8 +47,6 @@ class MediaGalleriesScanResultDialogViews
   virtual ui::ModalType GetModalType() const OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
-  virtual views::NonClientFrameView* CreateNonClientFrameView(
-      views::Widget* widget) OVERRIDE;
 
   // views::ButtonListener implementation:
   virtual void ButtonPressed(views::Button* sender,
diff --git a/chrome/browser/ui/views/login_prompt_views.cc b/chrome/browser/ui/views/login_prompt_views.cc
index 74fe3b8..d861600 100644
--- a/chrome/browser/ui/views/login_prompt_views.cc
+++ b/chrome/browser/ui/views/login_prompt_views.cc
@@ -8,7 +8,6 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/tab_contents/tab_util.h"
-#include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/browser/ui/views/login_view.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
@@ -110,15 +109,6 @@ class LoginHandlerViews : public LoginHandler,
     return true;
   }
 
-  // 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 {
-    return CreateConstrainedStyleNonClientFrameView(
-        widget,
-        GetWebContentsForLogin()->GetBrowserContext());
-  }
-
   virtual views::View* GetInitiallyFocusedView() OVERRIDE {
     return login_view_->GetInitiallyFocusedView();
   }
diff --git a/chrome/browser/ui/views/pdf_password_dialog.cc b/chrome/browser/ui/views/pdf_password_dialog.cc
index 15ce476..0d5e656 100644
--- a/chrome/browser/ui/views/pdf_password_dialog.cc
+++ b/chrome/browser/ui/views/pdf_password_dialog.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/pdf/pdf_tab_helper.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"
@@ -38,8 +37,6 @@ class PDFPasswordDialogViews : public views::DialogDelegate {
   // views::WidgetDelegate:
   virtual views::View* GetInitiallyFocusedView() OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
-  virtual views::NonClientFrameView* CreateNonClientFrameView(
-      views::Widget* widget) OVERRIDE;
   virtual views::Widget* GetWidget() OVERRIDE;
   virtual const views::Widget* GetWidget() const OVERRIDE;
   virtual void DeleteDelegate() OVERRIDE;
@@ -50,7 +47,6 @@ class PDFPasswordDialogViews : public views::DialogDelegate {
   views::MessageBoxView* message_box_view_;
 
   views::Widget* dialog_;
-  content::BrowserContext* browser_context_;
 
   PasswordDialogClosedCallback callback_;
 
@@ -63,7 +59,6 @@ PDFPasswordDialogViews::PDFPasswordDialogViews(
     const PasswordDialogClosedCallback& callback)
     : message_box_view_(NULL),
       dialog_(NULL),
-      browser_context_(web_contents->GetBrowserContext()),
       callback_(callback) {
   views::MessageBoxView::InitParams init_params(prompt);
   init_params.options = views::MessageBoxView::HAS_PROMPT_FIELD;
@@ -129,13 +124,6 @@ views::View* PDFPasswordDialogViews::GetContentsView() {
   return message_box_view_;
 }
 
-// TODO(wittman): Remove this override once we move to the new style frame view
-// on all dialogs.
-views::NonClientFrameView* PDFPasswordDialogViews::CreateNonClientFrameView(
-    views::Widget* widget) {
-  return CreateConstrainedStyleNonClientFrameView(widget, browser_context_);
-}
-
 views::Widget* PDFPasswordDialogViews::GetWidget() {
   return message_box_view_->GetWidget();
 }
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.cc b/chrome/browser/ui/views/ssl_client_certificate_selector.cc
index 2e105e1..991bc94 100644
--- a/chrome/browser/ui/views/ssl_client_certificate_selector.cc
+++ b/chrome/browser/ui/views/ssl_client_certificate_selector.cc
@@ -9,7 +9,6 @@
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/certificate_viewer.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"
@@ -238,16 +237,6 @@ bool SSLClientCertificateSelector::Accept() {
   return false;
 }
 
-// TODO(wittman): Remove this override once we move to the new style frame view
-// on all dialogs.
-views::NonClientFrameView*
-    SSLClientCertificateSelector::CreateNonClientFrameView(
-        views::Widget* widget) {
-  return CreateConstrainedStyleNonClientFrameView(
-      widget,
-      web_contents_->GetBrowserContext());
-}
-
 views::View* SSLClientCertificateSelector::GetInitiallyFocusedView() {
   return table_;
 }
diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector.h b/chrome/browser/ui/views/ssl_client_certificate_selector.h
index 2056b52..26048eb 100644
--- a/chrome/browser/ui/views/ssl_client_certificate_selector.h
+++ b/chrome/browser/ui/views/ssl_client_certificate_selector.h
@@ -61,8 +61,6 @@ class SSLClientCertificateSelector : public SSLClientAuthObserver,
   virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
-  virtual views::NonClientFrameView* CreateNonClientFrameView(
-      views::Widget* widget) OVERRIDE;
   virtual views::View* GetInitiallyFocusedView() OVERRIDE;
   virtual views::View* CreateExtraView() OVERRIDE;
   virtual ui::ModalType GetModalType() const OVERRIDE;
diff --git a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc
index cad39c4..907e74f 100644
--- a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc
+++ b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc
@@ -9,7 +9,6 @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h"
-#include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
@@ -41,8 +40,7 @@ TabModalConfirmDialogViews::TabModalConfirmDialogViews(
     TabModalConfirmDialogDelegate* delegate,
     content::WebContents* web_contents)
     : delegate_(delegate),
-      dialog_(NULL),
-      browser_context_(web_contents->GetBrowserContext()) {
+      dialog_(NULL) {
   views::MessageBoxView::InitParams init_params(delegate->GetDialogMessage());
   init_params.inter_row_vertical_spacing =
       views::kUnrelatedControlVerticalSpacing;
@@ -124,13 +122,6 @@ views::View* TabModalConfirmDialogViews::GetContentsView() {
   return message_box_view_;
 }
 
-// TODO(wittman): Remove this override once we move to the new style frame view
-// on all dialogs.
-views::NonClientFrameView* TabModalConfirmDialogViews::CreateNonClientFrameView(
-    views::Widget* widget) {
-  return CreateConstrainedStyleNonClientFrameView(widget, browser_context_);
-}
-
 views::Widget* TabModalConfirmDialogViews::GetWidget() {
   return message_box_view_->GetWidget();
 }
diff --git a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.h b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.h
index 100a474..9847e5c 100644
--- a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.h
+++ b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.h
@@ -14,7 +14,6 @@
 
 namespace content {
 class WebContents;
-class BrowserContext;
 }
 
 namespace views {
@@ -44,8 +43,6 @@ class TabModalConfirmDialogViews : public TabModalConfirmDialog,
 
   // views::WidgetDelegate:
   virtual views::View* GetContentsView() OVERRIDE;
-  virtual views::NonClientFrameView* CreateNonClientFrameView(
-      views::Widget* widget) OVERRIDE;
   virtual views::Widget* GetWidget() OVERRIDE;
   virtual const views::Widget* GetWidget() const OVERRIDE;
   virtual void DeleteDelegate() OVERRIDE;
@@ -70,7 +67,6 @@ class TabModalConfirmDialogViews : public TabModalConfirmDialog,
   views::MessageBoxView* message_box_view_;
 
   views::Widget* dialog_;
-  content::BrowserContext* browser_context_;
 
   DISALLOW_COPY_AND_ASSIGN(TabModalConfirmDialogViews);
 };
diff --git a/ui/views/window/dialog_delegate.cc b/ui/views/window/dialog_delegate.cc
index a4849e7..0bfba371 100644
--- a/ui/views/window/dialog_delegate.cc
+++ b/ui/views/window/dialog_delegate.cc
@@ -10,14 +10,11 @@
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/controls/button/label_button.h"
+#include "ui/views/corewm/shadow_types.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_observer.h"
 #include "ui/views/window/dialog_client_view.h"
 
-#if defined(USE_AURA)
-#include "ui/views/corewm/shadow_types.h"
-#endif
-
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -158,35 +155,19 @@ NonClientFrameView* DialogDelegate::CreateNonClientFrameView(Widget* widget) {
 
 // static
 NonClientFrameView* DialogDelegate::CreateDialogFrameView(Widget* widget) {
-  return CreateDialogFrameView(widget, false);
-}
-
-// static
-NonClientFrameView* DialogDelegate::CreateDialogFrameView(
-    Widget* widget,
-    bool force_opaque_border) {
   BubbleFrameView* frame = new BubbleFrameView(gfx::Insets());
   const SkColor color = widget->GetNativeTheme()->GetSystemColor(
       ui::NativeTheme::kColorId_DialogBackground);
-  if (force_opaque_border) {
-    frame->SetBubbleBorder(scoped_ptr<BubbleBorder>(new BubbleBorder(
-        BubbleBorder::NONE, BubbleBorder::NO_SHADOW_OPAQUE_BORDER, color)));
-  } else {
-    frame->SetBubbleBorder(scoped_ptr<BubbleBorder>(new BubbleBorder(
-        BubbleBorder::FLOAT, BubbleBorder::SMALL_SHADOW, color)));
-  }
+  frame->SetBubbleBorder(scoped_ptr<BubbleBorder>(new BubbleBorder(
+      BubbleBorder::FLOAT, BubbleBorder::SMALL_SHADOW, color)));
   DialogDelegate* delegate = widget->widget_delegate()->AsDialogDelegate();
   if (delegate) {
     View* titlebar_view = delegate->CreateTitlebarExtraView();
     if (titlebar_view)
       frame->SetTitlebarExtraView(titlebar_view);
   }
-  if (force_opaque_border)
-    widget->set_frame_type(views::Widget::FRAME_TYPE_FORCE_CUSTOM);
-#if defined(USE_AURA)
   // TODO(msw): Add a matching shadow type and remove the bubble frame border?
   corewm::SetShadowType(widget->GetNativeWindow(), corewm::SHADOW_TYPE_NONE);
-#endif
   return frame;
 }
 
diff --git a/ui/views/window/dialog_delegate.h b/ui/views/window/dialog_delegate.h
index 8e8948de..9e87c57 100644
--- a/ui/views/window/dialog_delegate.h
+++ b/ui/views/window/dialog_delegate.h
@@ -91,14 +91,6 @@ class VIEWS_EXPORT DialogDelegate : public ui::DialogModel,
 
   // Create a frame view using the new dialog style.
   static NonClientFrameView* CreateDialogFrameView(Widget* widget);
-  // The semi-transparent border and shadow of the new style frame view does not
-  // work on child windows under Views/Win32. This is a kludge to get a
-  // reasonable-looking opaque border for the dialog. Note that this does not
-  // support arrows.
-  //
-  // TODO(wittman): Remove once WinAura is in place.
-  static NonClientFrameView* CreateDialogFrameView(Widget* widget,
-                                                   bool force_opaque_border);
 
   // Returns whether this particular dialog should use the new dialog style.
   virtual bool UseNewStyleForThisDialog() const;