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

Unified Diff: content/browser/frame_host/navigation_entry_impl.cc

Issue 2648053002: Remove old session history logic. (Closed)
Patch Set: Remove comment. Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/navigation_entry_impl.cc
diff --git a/content/browser/frame_host/navigation_entry_impl.cc b/content/browser/frame_host/navigation_entry_impl.cc
index 86a2aec4bd1fac3e2911ffc81cd358cc41d44d04..b528804d67b54cdf9e73fa0adfcbb13afd9750b3 100644
--- a/content/browser/frame_host/navigation_entry_impl.cc
+++ b/content/browser/frame_host/navigation_entry_impl.cc
@@ -355,11 +355,6 @@ const base::string16& NavigationEntryImpl::GetTitle() const {
}
void NavigationEntryImpl::SetPageState(const PageState& state) {
- if (!SiteIsolationPolicy::UseSubframeNavigationEntries()) {
- frame_tree_->frame_entry->SetPageState(state);
- return;
- }
-
// SetPageState should only be called before the NavigationEntry has been
// loaded, such as for restore (when there are no subframe
// FrameNavigationEntries yet). However, some callers expect to call this
@@ -387,10 +382,9 @@ void NavigationEntryImpl::SetPageState(const PageState& state) {
}
PageState NavigationEntryImpl::GetPageState() const {
- // Just return the main frame's PageState in default Chrome, or if there are
- // no subframe FrameNavigationEntries.
- if (!SiteIsolationPolicy::UseSubframeNavigationEntries() ||
- frame_tree_->children.size() == 0U)
+ // Just return the main frame's state if there are no subframe
+ // FrameNavigationEntries.
+ if (frame_tree_->children.size() == 0U)
return frame_tree_->frame_entry->page_state();
// When we're using subframe entries, each FrameNavigationEntry has a
« no previous file with comments | « content/browser/frame_host/navigation_controller_impl.cc ('k') | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698