Refactor the loading tracking logic in WebContentsImpl.

content/browser/web_contents/web_contents_impl.h

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 782389f651aa033f0248c0d2bda583d5a70cbd3d..2a6d9c811165ab0cea5370276d5f2289fb5184e1 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -967,6 +967,10 @@ class CONTENT_EXPORT WebContentsImpl
   void RemoveAllMediaPlayerEntries(RenderFrameHost* render_frame_host,
                                    ActiveMediaPlayerMap* player_map);
 
+  // Returns true if at least one of the nodes in the |frame_tree_| is loading,
+  // false otherwise.
+  bool IsFrameTreeLoading();

[Charlie Reis, 2015/02/20 23:42:12]

Can you put this with the other loading functions (around line 900)?

[Fabrice (no longer in Chrome), 2015/02/23 20:02:06]

Done.

+
   // Data for core operation ---------------------------------------------------
 
   // Delegate for notifying our owner about stuff. Not owned by us.
@@ -1055,18 +1059,10 @@ class CONTENT_EXPORT WebContentsImpl
   net::LoadStateWithParam load_state_;
   base::string16 load_state_host_;
 
-  // LoadingProgressMap maps FrameTreeNode IDs to a double representing that
-  // frame's completion (from 0 to 1).
-  typedef base::hash_map<int64, double> LoadingProgressMap;
-  LoadingProgressMap loading_progresses_;
   double loading_total_progress_;
 
   base::TimeTicks loading_last_progress_update_;
 
-  // Counter to track how many frames have sent start notifications but not
-  // stop notifications.
-  int loading_frames_in_progress_;
-
   // Upload progress, for displaying in the status bar.
   // Set to zero when there is no significant upload happening.
   uint64 upload_size_;