Index: content/browser/web_contents/web_contents_impl.h |
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h |
index 6753535c26ea04acf21c1b24af7520a6bd401284..0dccbd590065295c4eb26e88f700a5b1312aac0c 100644 |
--- a/content/browser/web_contents/web_contents_impl.h |
+++ b/content/browser/web_contents/web_contents_impl.h |
@@ -370,9 +370,6 @@ class CONTENT_EXPORT WebContentsImpl |
const GURL& GetMainFrameLastCommittedURL() const override; |
void RenderFrameCreated(RenderFrameHost* render_frame_host) override; |
void RenderFrameDeleted(RenderFrameHost* render_frame_host) override; |
- void DidStartLoading(RenderFrameHost* render_frame_host, |
- bool to_different_document) override; |
- void DidStopLoading() override; |
void SwappedOut(RenderFrameHost* render_frame_host) override; |
void DidDeferAfterResponseStarted( |
const TransitionLayerData& transition_data) override; |
@@ -536,6 +533,10 @@ class CONTENT_EXPORT WebContentsImpl |
void RequestOpenURL(RenderFrameHostImpl* render_frame_host, |
const OpenURLParams& params) override; |
bool ShouldPreserveAbortedURLs() override; |
+ void DidStartLoading(FrameTreeNode* frame_tree_node, |
+ bool to_different_document) override; |
+ void DidStopLoading() override; |
+ void DidChangeLoadProgress() override; |
// RenderWidgetHostDelegate -------------------------------------------------- |
@@ -775,9 +776,6 @@ class CONTENT_EXPORT WebContentsImpl |
const GURL& target_url); |
void OnDocumentLoadedInFrame(); |
void OnDidFinishLoad(const GURL& url); |
- void OnDidStartLoading(bool to_different_document); |
- void OnDidStopLoading(); |
- void OnDidChangeLoadProgress(double load_progress); |
void OnGoToEntryAtOffset(int offset); |
void OnUpdateZoomLimits(int minimum_percent, |
int maximum_percent); |
@@ -908,11 +906,11 @@ class CONTENT_EXPORT WebContentsImpl |
// Tracking loading progress ------------------------------------------------- |
- // Resets the tracking state of the current load. |
+ // Resets the tracking state of the current load progress. |
void ResetLoadProgressState(); |
- // Calculates the progress of the current load and notifies the delegate. |
- void SendLoadProgressChanged(); |
+ // Notifies the delegate that the load progress was updated. |
+ void SendChangeLoadProgress(); |
// Misc non-view stuff ------------------------------------------------------- |
@@ -1069,8 +1067,6 @@ class CONTENT_EXPORT WebContentsImpl |
net::LoadStateWithParam load_state_; |
base::string16 load_state_host_; |
- double loading_total_progress_; |
- |
base::TimeTicks loading_last_progress_update_; |
// Upload progress, for displaying in the status bar. |