Move resource_message_filter and resource_request_details to the renderer_hos...

chrome/browser/views/repost_form_warning_view.cc

Index: chrome/browser/views/repost_form_warning_view.cc
===================================================================
--- chrome/browser/views/repost_form_warning_view.cc	(revision 9042)
+++ chrome/browser/views/repost_form_warning_view.cc	(working copy)
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/repost_form_warning_dialog.h"
+#include "chrome/browser/views/repost_form_warning_view.h"
 
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
@@ -13,17 +13,36 @@
 
 #include "generated_resources.h"
 
-///////////////////////////////////////////////////////////////////////////////
-// RepostFormWarningDialog, public:
+// Implementation of function declared in
+// browser/tab_contents/repost_form_warning.h
+void RunRepostFormWarningDialog(NavigationController* navigation_controller) {
+  RepostFormWarningView* dialog =
+      new RepostFormWarningView(navigation_controller);
+}
 
-// static
-void RepostFormWarningDialog::RunRepostFormWarningDialog(
-    NavigationController* navigation_controller) {
-  RepostFormWarningDialog* dialog =
-      new RepostFormWarningDialog(navigation_controller);
+RepostFormWarningView::RepostFormWarningView(
+    NavigationController* navigation_controller)
+      : navigation_controller_(navigation_controller),
+        message_box_view_(NULL) {
+  message_box_view_ = new MessageBoxView(
+      MessageBoxView::kIsConfirmMessageBox,
+      l10n_util::GetString(IDS_HTTP_POST_WARNING),
+      L"");
+  // TODO(beng): fix this - this dialog box should be shown by a method on the
+  //             Browser.
+  HWND root_hwnd = NULL;
+  if (BrowserList::GetLastActive()) {
+    root_hwnd = reinterpret_cast<HWND>(BrowserList::GetLastActive()->
+        window()->GetNativeHandle());
+  }
+  views::Window::CreateChromeWindow(root_hwnd, gfx::Rect(), this)->Show();
+  NotificationService::current()->AddObserver(
+      this, NotificationType::LOAD_START, NotificationService::AllSources());
+  NotificationService::current()->AddObserver(
+      this, NotificationType::TAB_CLOSING, NotificationService::AllSources());
 }
 
-RepostFormWarningDialog::~RepostFormWarningDialog() {
+RepostFormWarningView::~RepostFormWarningView() {
   NotificationService::current()->RemoveObserver(
       this, NotificationType::LOAD_START, NotificationService::AllSources());
   NotificationService::current()->RemoveObserver(
@@ -31,13 +50,13 @@
 }
 
 //////////////////////////////////////////////////////////////////////////////
-// RepostFormWarningDialog, views::DialogDelegate implementation:
+// RepostFormWarningView, views::DialogDelegate implementation:
 
-std::wstring RepostFormWarningDialog::GetWindowTitle() const {
+std::wstring RepostFormWarningView::GetWindowTitle() const {
   return l10n_util::GetString(IDS_HTTP_POST_WARNING_TITLE);
 }
 
-std::wstring RepostFormWarningDialog::GetDialogButtonLabel(
+std::wstring RepostFormWarningView::GetDialogButtonLabel(
     DialogButton button) const {
   if (button == DialogDelegate::DIALOGBUTTON_OK)
     return l10n_util::GetString(IDS_HTTP_POST_WARNING_RESEND);
@@ -46,55 +65,33 @@
   return L"";
 }
 
-void RepostFormWarningDialog::WindowClosing() {
+void RepostFormWarningView::WindowClosing() {
   delete this;
 }
 
-bool RepostFormWarningDialog::Cancel() {
+bool RepostFormWarningView::Cancel() {
   return true;
 }
 
-bool RepostFormWarningDialog::Accept() {
+bool RepostFormWarningView::Accept() {
   if (navigation_controller_)
     navigation_controller_->Reload(false);
   return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// RepostFormWarningDialog, views::WindowDelegate implementation:
+// RepostFormWarningView, views::WindowDelegate implementation:
 
-views::View* RepostFormWarningDialog::GetContentsView() {
+views::View* RepostFormWarningView::GetContentsView() {
   return message_box_view_;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// RepostFormWarningDialog, private:
+// RepostFormWarningView, private:
 
-RepostFormWarningDialog::RepostFormWarningDialog(
-    NavigationController* navigation_controller)
-      : navigation_controller_(navigation_controller),
-        message_box_view_(NULL) {
-  message_box_view_ = new MessageBoxView(
-      MessageBoxView::kIsConfirmMessageBox,
-      l10n_util::GetString(IDS_HTTP_POST_WARNING),
-      L"");
-  // TODO(beng): fix this - this dialog box should be shown by a method on the
-  //             Browser.
-  HWND root_hwnd = NULL;
-  if (BrowserList::GetLastActive()) {
-    root_hwnd = reinterpret_cast<HWND>(BrowserList::GetLastActive()->
-        window()->GetNativeHandle());
-  }
-  views::Window::CreateChromeWindow(root_hwnd, gfx::Rect(), this)->Show();
-  NotificationService::current()->AddObserver(
-      this, NotificationType::LOAD_START, NotificationService::AllSources());
-  NotificationService::current()->AddObserver(
-      this, NotificationType::TAB_CLOSING, NotificationService::AllSources());
-}
-
-void RepostFormWarningDialog::Observe(NotificationType type,
-                                      const NotificationSource& source,
-                                      const NotificationDetails& details) {
+void RepostFormWarningView::Observe(NotificationType type,
+                                    const NotificationSource& source,
+                                    const NotificationDetails& details) {
   // Close the dialog if we load a page (because reloading might not apply to
   // the same page anymore) or if the tab is closed, because then we won't have
   // a navigation controller anymore.
Property changes on: chrome\browser\views\repost_form_warning_view.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/chrome/browser/repost_form_warning_dialog.cc:r69-2775