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

Unified Diff: content/renderer/render_view_impl.h

Issue 8404018: chrome.loadTimes() shouldn't be affected by in-document navigation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync and merge Created 9 years, 1 month 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
« no previous file with comments | « content/public/renderer/navigation_state.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index f8d742a76f7151fc29ad6b81bf64f112f24d6d6f..0b40672e4e140a6530e2d5a1d921fd4663668b55 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -79,10 +79,10 @@ class WebPluginDelegateProxy;
class WebUIBindings;
namespace content {
-class RenderViewTest;
-class NavigationState;
+class DocumentState;
class P2PSocketDispatcher;
class RenderViewObserver;
+class RenderViewTest;
} // namespace content
namespace gfx {
@@ -907,6 +907,11 @@ class RenderViewImpl : public RenderWidget,
const WebKit::WebURLError& error,
bool replace);
+ // If we initiated a navigation, this function will populate |document_state|
+ // with the navigation information saved in OnNavigate().
+ void PopulateStateFromPendingNavigationParams(
+ content::DocumentState* document_state);
+
// Starts nav_state_sync_timer_ if it isn't already running.
void StartNavStateSyncTimerIfNecessary();
@@ -995,7 +1000,7 @@ class RenderViewImpl : public RenderWidget,
// the WebDataSource::ExtraData attribute. We use pending_navigation_state_
// as a temporary holder for the state until the WebDataSource corresponding
// to the new navigation is created. See DidCreateDataSource.
- scoped_ptr<content::NavigationState> pending_navigation_state_;
+ scoped_ptr<ViewMsg_Navigate_Params> pending_navigation_params_;
// Timer used to delay the updating of nav state (see SyncNavigationState).
base::OneShotTimer<RenderViewImpl> nav_state_sync_timer_;
« no previous file with comments | « content/public/renderer/navigation_state.cc ('k') | content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698