6 files changed, 50 insertions, 64 deletions
diff --git a/chrome/browser/ui/views/browser_dialogs.h b/chrome/browser/ui/views/browser_dialogs.h
index af21b2c..4afb960 100644
--- a/chrome/browser/ui/views/browser_dialogs.h
+++ b/chrome/browser/ui/views/browser_dialogs.h
@@ -82,15 +82,10 @@ void EditSearchEngine(gfx::NativeWindow parent,
                       EditSearchEngineControllerDelegate* delegate,
                       Profile* profile);
 
-// Shows the repost form confirmation dialog box.
-void ShowRepostFormWarningDialog(gfx::NativeWindow parent_window,
-                                 TabContents* tab_contents);
-
 // Shows the collected cookies dialog box.
 void ShowCollectedCookiesDialog(gfx::NativeWindow parent_window,
                                 TabContentsWrapper* tab_contents);
 
-
 // Shows the create web app shortcut dialog box.
 void ShowCreateWebAppShortcutsDialog(gfx::NativeWindow parent_window,
                                      TabContentsWrapper* tab_contents);
diff --git a/chrome/browser/ui/views/dialog_stubs_gtk.cc b/chrome/browser/ui/views/dialog_stubs_gtk.cc
index 5306594..e255bd5 100644
--- a/chrome/browser/ui/views/dialog_stubs_gtk.cc
+++ b/chrome/browser/ui/views/dialog_stubs_gtk.cc
@@ -10,18 +10,12 @@
 #include "base/logging.h"
 #include "chrome/browser/ui/gtk/edit_search_engine_dialog.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
-#include "chrome/browser/ui/webui/collected_cookies_ui_delegate.h"
 #include "ui/gfx/native_widget_types.h"
 
 #if !defined(WEBUI_TASK_MANAGER)
 #include "chrome/browser/ui/gtk/task_manager_gtk.h"
 #endif
 
-#if !defined(OS_CHROMEOS)
-#include "chrome/browser/ui/gtk/collected_cookies_gtk.h"
-#include "chrome/browser/ui/gtk/repost_form_warning_gtk.h"
-#endif
-
 namespace browser {
 
 #if !defined(WEBUI_TASK_MANAGER)
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index d6b30c7..f8f7b6e 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -1146,10 +1146,6 @@ DownloadShelf* BrowserView::GetDownloadShelf() {
 #endif
 }
 
-void BrowserView::ShowRepostFormWarningDialog(TabContents* tab_contents) {
-  browser::ShowRepostFormWarningDialog(GetNativeHandle(), tab_contents);
-}
-
 void BrowserView::ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) {
   browser::ShowCollectedCookiesDialog(GetNativeHandle(), wrapper);
 }
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index 24c010e..ba32747 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -307,7 +307,6 @@ class BrowserView : public BrowserWindow,
   void SetDownloadShelfVisible(bool visible);
   virtual bool IsDownloadShelfVisible() const OVERRIDE;
   virtual DownloadShelf* GetDownloadShelf() OVERRIDE;
-  virtual void ShowRepostFormWarningDialog(TabContents* tab_contents) OVERRIDE;
   virtual void ShowCollectedCookiesDialog(TabContentsWrapper* wrapper) OVERRIDE;
   virtual void ConfirmBrowserCloseWithPendingDownloads() OVERRIDE;
   virtual void UserChangedTheme() OVERRIDE;
diff --git a/chrome/browser/ui/views/repost_form_warning_view.cc b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc
index 36d9290..761a7a1 100644
--- a/chrome/browser/ui/views/repost_form_warning_view.cc
+++ b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc
@@ -2,13 +2,13 @@
 // 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/repost_form_warning_view.h"
+#include "chrome/browser/ui/views/tab_modal_confirm_dialog_views.h"
 
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/repost_form_warning_controller.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ -19,74 +19,76 @@
 namespace browser {
 
 // Declared in browser_dialogs.h so others don't have to depend on our header.
-void ShowRepostFormWarningDialog(gfx::NativeWindow parent_window,
-                                 TabContents* tab_contents) {
-  new RepostFormWarningView(parent_window, tab_contents);
+void ShowTabModalConfirmDialog(TabModalConfirmDialogDelegate* delegate,
+                         gfx::NativeWindow parent_window,
+                         TabContents* tab_contents) {
+  new TabModalConfirmDialogViews(delegate, parent_window, tab_contents);
 }
 
 }  // namespace browser
 
 //////////////////////////////////////////////////////////////////////////////
-// RepostFormWarningView, constructor & destructor:
+// TabModalConfirmDialogViews, constructor & destructor:
 
-RepostFormWarningView::RepostFormWarningView(
+TabModalConfirmDialogViews::TabModalConfirmDialogViews(
+    TabModalConfirmDialogDelegate* delegate,
     gfx::NativeWindow parent_window,
     TabContents* tab_contents)
-      : controller_(new RepostFormWarningController(tab_contents)),
-        message_box_view_(NULL) {
+    : delegate_(delegate),
+      message_box_view_(NULL) {
   message_box_view_ = new views::MessageBoxView(
       views::MessageBoxView::NO_OPTIONS,
-      l10n_util::GetStringUTF16(IDS_HTTP_POST_WARNING),
+      delegate->GetMessage(),
       string16());
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(tab_contents);
-  controller_->set_window(new ConstrainedWindowViews(wrapper, this));
+  delegate_->set_window(new ConstrainedWindowViews(wrapper, this));
 }
 
-RepostFormWarningView::~RepostFormWarningView() {
+TabModalConfirmDialogViews::~TabModalConfirmDialogViews() {
 }
 
 //////////////////////////////////////////////////////////////////////////////
-// RepostFormWarningView, views::DialogDelegate implementation:
+// TabModalConfirmDialogViews, views::DialogDelegate implementation:
 
-string16 RepostFormWarningView::GetWindowTitle() const {
-  return l10n_util::GetStringUTF16(IDS_HTTP_POST_WARNING_TITLE);
+string16 TabModalConfirmDialogViews::GetWindowTitle() const {
+  return delegate_->GetTitle();
 }
 
-string16 RepostFormWarningView::GetDialogButtonLabel(
+string16 TabModalConfirmDialogViews::GetDialogButtonLabel(
     ui::DialogButton button) const {
   if (button == ui::DIALOG_BUTTON_OK)
-    return l10n_util::GetStringUTF16(IDS_HTTP_POST_WARNING_RESEND);
+    return delegate_->GetAcceptButtonTitle();
   if (button == ui::DIALOG_BUTTON_CANCEL)
-    return l10n_util::GetStringUTF16(IDS_CANCEL);
+    return delegate_->GetCancelButtonTitle();
   return string16();
 }
 
-views::View* RepostFormWarningView::GetContentsView() {
-  return message_box_view_;
+bool TabModalConfirmDialogViews::Cancel() {
+  delegate_->Cancel();
+  return true;
 }
 
-views::Widget* RepostFormWarningView::GetWidget() {
-  return message_box_view_->GetWidget();
+bool TabModalConfirmDialogViews::Accept() {
+  delegate_->Accept();
+  return true;
 }
 
-const views::Widget* RepostFormWarningView::GetWidget() const {
-  return message_box_view_->GetWidget();
-}
+///////////////////////////////////////////////////////////////////////////////
+// TabModalConfirmDialogViews, views::WidgetDelegate implementation:
 
-bool RepostFormWarningView::Cancel() {
-  controller_->Cancel();
-  return true;
+views::View* TabModalConfirmDialogViews::GetContentsView() {
+  return message_box_view_;
 }
 
-bool RepostFormWarningView::Accept() {
-  controller_->Continue();
-  return true;
+views::Widget* TabModalConfirmDialogViews::GetWidget() {
+  return message_box_view_->GetWidget();
 }
 
-///////////////////////////////////////////////////////////////////////////////
-// RepostFormWarningView, RepostFormWarning implementation:
+const views::Widget* TabModalConfirmDialogViews::GetWidget() const {
+  return message_box_view_->GetWidget();
+}
 
-void RepostFormWarningView::DeleteDelegate() {
+void TabModalConfirmDialogViews::DeleteDelegate() {
   delete this;
 }
diff --git a/chrome/browser/ui/views/repost_form_warning_view.h b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.h
index d12301f..86c106c 100644
--- a/chrome/browser/ui/views/repost_form_warning_view.h
+++ b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.h
@@ -2,35 +2,34 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_REPOST_FORM_WARNING_VIEW_H_
-#define CHROME_BROWSER_UI_VIEWS_REPOST_FORM_WARNING_VIEW_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_TAB_MODAL_CONFIRM_DIALOG_VIEWS_H_
+#define CHROME_BROWSER_UI_VIEWS_TAB_MODAL_CONFIRM_DIALOG_VIEWS_H_
 #pragma once
 
 #include "ui/gfx/native_widget_types.h"
 #include "ui/views/window/dialog_delegate.h"
 
-class RepostFormWarningController;
+class TabModalConfirmDialogDelegate;
 class TabContents;
 
 namespace views {
 class MessageBoxView;
 }
 
-// Displays a dialog that warns the user that they are about to resubmit
-// a form.
+// Displays a tab-modal dialog, i.e. a dialog that will block the current page
+// but still allow the user to switch to a different page.
 // To display the dialog, allocate this object on the heap. It will open the
 // dialog from its constructor and then delete itself when the user dismisses
 // the dialog.
-class RepostFormWarningView : public views::DialogDelegate {
+class TabModalConfirmDialogViews : public views::DialogDelegate {
  public:
-  // Use BrowserWindow::ShowRepostFormWarningDialog to use.
-  RepostFormWarningView(gfx::NativeWindow parent_window,
-                        TabContents* tab_contents);
+  TabModalConfirmDialogViews(TabModalConfirmDialogDelegate* delegate,
+                       gfx::NativeWindow parent_window,
+                       TabContents* tab_contents);
 
   // views::DialogDelegate:
   virtual string16 GetWindowTitle() const OVERRIDE;
   virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
-  virtual void DeleteDelegate() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
@@ -38,16 +37,17 @@ class RepostFormWarningView : public views::DialogDelegate {
   virtual views::View* GetContentsView() OVERRIDE;
   virtual views::Widget* GetWidget() OVERRIDE;
   virtual const views::Widget* GetWidget() const OVERRIDE;
+  virtual void DeleteDelegate() OVERRIDE;
 
  private:
-  virtual ~RepostFormWarningView();
+  virtual ~TabModalConfirmDialogViews();
 
-  scoped_ptr<RepostFormWarningController> controller_;
+  scoped_ptr<TabModalConfirmDialogDelegate> delegate_;
 
   // The message box view whose commands we handle.
   views::MessageBoxView* message_box_view_;
 
-  DISALLOW_COPY_AND_ASSIGN(RepostFormWarningView);
+  DISALLOW_COPY_AND_ASSIGN(TabModalConfirmDialogViews);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_REPOST_FORM_WARNING_VIEW_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_TAB_MODAL_CONFIRM_DIALOG_VIEWS_H_