summaryrefslogtreecommitdiffstats
path: root/chrome/browser/navigation_controller.cc
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-19 00:42:30 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-19 00:42:30 +0000
commita3a1d14240d6e41a0b6732ebcd3600399c64b26a (patch)
treea38ced2761bdf4447bf180470fd5dade857ef11b /chrome/browser/navigation_controller.cc
parent5b62083c99317965244123c031c707d53f0a03f1 (diff)
downloadchromium_src-a3a1d14240d6e41a0b6732ebcd3600399c64b26a.zip
chromium_src-a3a1d14240d6e41a0b6732ebcd3600399c64b26a.tar.gz
chromium_src-a3a1d14240d6e41a0b6732ebcd3600399c64b26a.tar.bz2
Review URL: http://codereview.chromium.org/14809
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7281 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/navigation_controller.cc')
-rw-r--r--chrome/browser/navigation_controller.cc13
1 files changed, 4 insertions, 9 deletions
diff --git a/chrome/browser/navigation_controller.cc b/chrome/browser/navigation_controller.cc
index deee023..e1ccbb1 100644
--- a/chrome/browser/navigation_controller.cc
+++ b/chrome/browser/navigation_controller.cc
@@ -212,13 +212,10 @@ void NavigationController::Reload(bool check_for_repost) {
DiscardNonCommittedEntriesInternal();
int current_index = GetCurrentEntryIndex();
if (check_for_repost_ && check_for_repost && current_index != -1 &&
- GetEntryAtIndex(current_index)->has_post_data() &&
- active_contents_->AsWebContents() &&
- !active_contents_->AsWebContents()->showing_repost_interstitial()) {
- // The user is asking to reload a page with POST data and we're not showing
- // the POST interstitial. Prompt to make sure they really want to do this.
- // If they do, RepostFormWarningDialog calls us back with
- // ReloadDontCheckForRepost.
+ GetEntryAtIndex(current_index)->has_post_data()) {
+ // The user is asking to reload a page with POST data. Prompt to make sure
+ // they really want to do this. If they do, RepostFormWarningDialog calls us
+ // back with ReloadDontCheckForRepost.
active_contents_->Activate();
RepostFormWarningDialog::RunRepostFormWarningDialog(this);
} else {
@@ -538,7 +535,6 @@ const SkBitmap& NavigationController::GetLazyFavIcon() const {
bool NavigationController::RendererDidNavigate(
const ViewHostMsg_FrameNavigate_Params& params,
- bool is_interstitial,
LoadCommittedDetails* details) {
// Save the previous state before we clobber it.
if (GetLastCommittedEntry()) {
@@ -613,7 +609,6 @@ bool NavigationController::RendererDidNavigate(
details->entry = GetActiveEntry();
details->is_in_page = IsURLInPageNavigation(params.url);
details->is_main_frame = PageTransition::IsMainFrame(params.transition);
- details->is_interstitial = is_interstitial;
details->serialized_security_info = params.security_info;
details->is_content_filtered = params.is_content_filtered;
NotifyNavigationEntryCommitted(details);