diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-19 18:03:07 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-19 18:03:07 +0000 |
| commit | 67baffc858d3b6e6f22f3be3a043a9881fa633da (patch) | |
| tree | 90aef66bd9d2842223a6930f7ca349d6b4d9b9c2 /chrome/browser/repost_form_warning_controller.cc | |
| parent | ac49b8101e54cf78d6f21a7200c2038deccbe37b (diff) | |
| download | chromium_src-67baffc858d3b6e6f22f3be3a043a9881fa633da.zip chromium_src-67baffc858d3b6e6f22f3be3a043a9881fa633da.tar.gz chromium_src-67baffc858d3b6e6f22f3be3a043a9881fa633da.tar.bz2 | |
Reland r114898: Add TabModalConfirmDialogDelegate to show simple tab-modal confirmation dialogs.
This CL carves a TabModalConfirmDialogDelegate class (modeled after ConfirmInfobarDelegate) out of RepostFormWarningController and makes it a subclass thereof.
It also removes the ShowRepostFormWarning method from BrowserWindow and its subclasses, in favor of a method in browser_dialogs.h.
TBR=thakis@chromium.org,ben@chromium.org,estade@chromium.org,derat@chromium.org
BUG=92795
TEST=none
Review URL: http://codereview.chromium.org/8986005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115000 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/repost_form_warning_controller.cc')
| -rw-r--r-- | chrome/browser/repost_form_warning_controller.cc | 90 |
1 files changed, 46 insertions, 44 deletions
diff --git a/chrome/browser/repost_form_warning_controller.cc b/chrome/browser/repost_form_warning_controller.cc index 987b7d6..a53e95e 100644 --- a/chrome/browser/repost_form_warning_controller.cc +++ b/chrome/browser/repost_form_warning_controller.cc @@ -4,66 +4,68 @@ #include "chrome/browser/repost_form_warning_controller.h" -#include "chrome/browser/ui/constrained_window.h" +#if defined(TOOLKIT_USES_GTK) +#include <gtk/gtk.h> +#endif + +#include "base/bind.h" +#include "base/bind_helpers.h" +#include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" +#include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" RepostFormWarningController::RepostFormWarningController( TabContents* tab_contents) - : tab_contents_(tab_contents), - window_(NULL) { - NavigationController* controller = &tab_contents->controller(); - registrar_.Add(this, content::NOTIFICATION_LOAD_START, - content::Source<NavigationController>(controller)); - registrar_.Add(this, content::NOTIFICATION_TAB_CLOSING, - content::Source<NavigationController>(controller)); + : TabModalConfirmDialogDelegate(tab_contents), + navigation_controller_(&tab_contents->controller()) { registrar_.Add(this, content::NOTIFICATION_REPOST_WARNING_SHOWN, - content::Source<NavigationController>(controller)); + content::Source<NavigationController>(navigation_controller_)); } RepostFormWarningController::~RepostFormWarningController() { - // If we end up here, the constrained window has been closed, so make sure we - // don't close it again. - window_ = NULL; - // Make sure everything is cleaned up. - Cancel(); } -void RepostFormWarningController::Cancel() { - if (tab_contents_) { - tab_contents_->controller().CancelPendingReload(); - CloseDialog(); - } +string16 RepostFormWarningController::GetTitle() { + return l10n_util::GetStringUTF16(IDS_HTTP_POST_WARNING_TITLE); } -void RepostFormWarningController::Continue() { - if (tab_contents_) { - tab_contents_->controller().ContinuePendingReload(); - // If we reload the page, the dialog will be closed anyway. - } +string16 RepostFormWarningController::GetMessage() { + return l10n_util::GetStringUTF16(IDS_HTTP_POST_WARNING); } -void RepostFormWarningController::Observe(int type, - const content::NotificationSource& source, - const content::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. - if (tab_contents_ && - (type == content::NOTIFICATION_LOAD_START || - type == content::NOTIFICATION_TAB_CLOSING || - type == content::NOTIFICATION_REPOST_WARNING_SHOWN)) { - DCHECK_EQ(content::Source<NavigationController>(source).ptr(), - &tab_contents_->controller()); - Cancel(); - } +string16 RepostFormWarningController::GetAcceptButtonTitle() { + return l10n_util::GetStringUTF16(IDS_HTTP_POST_WARNING_RESEND); +} + +#if defined(TOOLKIT_USES_GTK) +const char* RepostFormWarningController::GetAcceptButtonIcon() { + return GTK_STOCK_REFRESH; +} + +const char* RepostFormWarningController::GetCancelButtonIcon() { + return GTK_STOCK_CANCEL; } +#endif // defined(TOOLKIT_USES_GTK) -void RepostFormWarningController::CloseDialog() { - // Make sure we won't do anything when |Cancel()| is called again. - tab_contents_ = NULL; - if (window_) { - window_->CloseConstrainedWindow(); - } +void RepostFormWarningController::OnAccepted() { + navigation_controller_->ContinuePendingReload(); +} + +void RepostFormWarningController::OnCanceled() { + navigation_controller_->CancelPendingReload(); +} + +void RepostFormWarningController::Observe( + int type, + const content::NotificationSource& source, + const content::NotificationDetails& details) { + // Close the dialog if we show an additional dialog, to avoid them + // stacking up. + if (type == content::NOTIFICATION_REPOST_WARNING_SHOWN) + Cancel(); + else + TabModalConfirmDialogDelegate::Observe(type, source, details); } |