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

Side by Side Diff: content/browser/frame_host/navigation_controller_impl.cc

Issue 2246363003: [DO NOT COMMIT] Test implementation of converting same URL navigation into a reload Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased and logging. Created 4 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
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 /* 5 /*
6 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
9 * (http://www.torchmobile.com/) 9 * (http://www.torchmobile.com/)
10 * 10 *
(...skipping 1810 matching lines...) Expand 10 before | Expand all | Expand 10 after
1821 // tab. 1821 // tab.
1822 if (IsRendererDebugURL(pending_entry_->GetURL())) { 1822 if (IsRendererDebugURL(pending_entry_->GetURL())) {
1823 // TODO(creis): Find the RVH for the correct frame. 1823 // TODO(creis): Find the RVH for the correct frame.
1824 if (!delegate_->GetRenderViewHost()->IsRenderViewLive() && 1824 if (!delegate_->GetRenderViewHost()->IsRenderViewLive() &&
1825 !IsInitialNavigation()) { 1825 !IsInitialNavigation()) {
1826 DiscardNonCommittedEntries(); 1826 DiscardNonCommittedEntries();
1827 return; 1827 return;
1828 } 1828 }
1829 } 1829 }
1830 1830
1831 if (GetLastCommittedEntry() && reload_type == NO_RELOAD) {
1832 if (pending_entry_->GetURL() == GetLastCommittedEntry()->GetURL()) {
1833 DiscardNonCommittedEntries();
1834 ReloadInternal(false, RELOAD);
1835 return;
1836 }
1837 }
1838
1831 // This call does not support re-entrancy. See http://crbug.com/347742. 1839 // This call does not support re-entrancy. See http://crbug.com/347742.
1832 CHECK(!in_navigate_to_pending_entry_); 1840 CHECK(!in_navigate_to_pending_entry_);
1833 in_navigate_to_pending_entry_ = true; 1841 in_navigate_to_pending_entry_ = true;
1834 bool success = NavigateToPendingEntryInternal(reload_type); 1842 bool success = NavigateToPendingEntryInternal(reload_type);
1835 in_navigate_to_pending_entry_ = false; 1843 in_navigate_to_pending_entry_ = false;
1836 1844
1837 if (!success) 1845 if (!success)
1838 DiscardNonCommittedEntries(); 1846 DiscardNonCommittedEntries();
1839 } 1847 }
1840 1848
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
2117 } 2125 }
2118 } 2126 }
2119 } 2127 }
2120 2128
2121 void NavigationControllerImpl::SetGetTimestampCallbackForTest( 2129 void NavigationControllerImpl::SetGetTimestampCallbackForTest(
2122 const base::Callback<base::Time()>& get_timestamp_callback) { 2130 const base::Callback<base::Time()>& get_timestamp_callback) {
2123 get_timestamp_callback_ = get_timestamp_callback; 2131 get_timestamp_callback_ = get_timestamp_callback;
2124 } 2132 }
2125 2133
2126 } // namespace content 2134 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/render_frame_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698