Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(60)

Side by Side Diff: content/browser/web_contents/navigation_controller_impl.h

Issue 23978003: Delete unneeded pending entries in DidFailProvisionalLoad to prevent a spoof. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Only clear the pending entry, not the transient. Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/web_contents/navigation_controller_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_ 5 #ifndef CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_
6 #define CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_ 6 #define CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 // contents. 282 // contents.
283 void FinishRestore(int selected_index, RestoreType type); 283 void FinishRestore(int selected_index, RestoreType type);
284 284
285 // Inserts a new entry or replaces the current entry with a new one, removing 285 // Inserts a new entry or replaces the current entry with a new one, removing
286 // all entries after it. The new entry will become the active one. 286 // all entries after it. The new entry will become the active one.
287 void InsertOrReplaceEntry(NavigationEntryImpl* entry, bool replace); 287 void InsertOrReplaceEntry(NavigationEntryImpl* entry, bool replace);
288 288
289 // Removes the entry at |index|, as long as it is not the current entry. 289 // Removes the entry at |index|, as long as it is not the current entry.
290 void RemoveEntryAtIndexInternal(int index); 290 void RemoveEntryAtIndexInternal(int index);
291 291
292 // Discards the pending and transient entries. 292 // Discards both the pending and transient entries.
293 void DiscardNonCommittedEntriesInternal(); 293 void DiscardNonCommittedEntriesInternal();
294 294
295 // Discards the transient entry. 295 // Discards only the pending entry.
296 void DiscardPendingEntry();
297
298 // Discards only the transient entry.
296 void DiscardTransientEntry(); 299 void DiscardTransientEntry();
297 300
298 // If we have the maximum number of entries, remove the oldest one in 301 // If we have the maximum number of entries, remove the oldest one in
299 // preparation to add another. 302 // preparation to add another.
300 void PruneOldestEntryIfFull(); 303 void PruneOldestEntryIfFull();
301 304
302 // Removes all entries except the last committed entry. If there is a new 305 // Removes all entries except the last committed entry. If there is a new
303 // pending navigation it is preserved. In contrast to PruneAllButVisible() 306 // pending navigation it is preserved. In contrast to PruneAllButVisible()
304 // this does not update the session history of the RenderView. Callers 307 // this does not update the session history of the RenderView. Callers
305 // must ensure that |CanPruneAllButVisible| returns true before calling this. 308 // must ensure that |CanPruneAllButVisible| returns true before calling this.
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 TimeSmoother time_smoother_; 403 TimeSmoother time_smoother_;
401 404
402 scoped_ptr<WebContentsScreenshotManager> screenshot_manager_; 405 scoped_ptr<WebContentsScreenshotManager> screenshot_manager_;
403 406
404 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl); 407 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl);
405 }; 408 };
406 409
407 } // namespace content 410 } // namespace content
408 411
409 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_ 412 #endif // CONTENT_BROWSER_WEB_CONTENTS_NAVIGATION_CONTROLLER_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/web_contents/navigation_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698