Index: content/browser/frame_host/load_progress_tracker.h |
diff --git a/content/renderer/load_progress_tracker.h b/content/browser/frame_host/load_progress_tracker.h |
similarity index 65% |
rename from content/renderer/load_progress_tracker.h |
rename to content/browser/frame_host/load_progress_tracker.h |
index 72a711ccc5ee77117299a37ff33bd70c5650dde3..6ce7f29ce65672ffb03daf93575b4db57d7b18c8 100644 |
--- a/content/renderer/load_progress_tracker.h |
+++ b/content/browser/frame_host/load_progress_tracker.h |
@@ -2,20 +2,21 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CONTENT_RENDERER_LOAD_PROGRESS_TRACKER_H_ |
-#define CONTENT_RENDERER_LOAD_PROGRESS_TRACKER_H_ |
+#ifndef CONTENT_BROWSER_FRAME_HOST_LOAD_PROGRESS_TRACKER_H_ |
+#define CONTENT_BROWSER_FRAME_HOST_LOAD_PROGRESS_TRACKER_H_ |
#include "base/containers/hash_tables.h" |
+#include "base/gtest_prod_util.h" |
#include "base/logging.h" |
#include "base/memory/weak_ptr.h" |
#include "base/time/time.h" |
namespace content { |
-class RenderViewImpl; |
+class NavigatorDelegate; |
class LoadProgressTracker { |
public: |
- explicit LoadProgressTracker(RenderViewImpl* render_view); |
+ explicit LoadProgressTracker(NavigatorDelegate* delegate); |
~LoadProgressTracker(); |
void DidStartLoading(int frame_routing_id); |
@@ -24,13 +25,15 @@ class LoadProgressTracker { |
void DidChangeLoadProgress(int frame_routing_id, double progress); |
private: |
+ FRIEND_TEST_ALL_PREFIXES(LoadProgressTrackerBrowserTest, BasicProgress); |
+ |
void ResetStates(); |
void SendChangeLoadProgress(); |
- RenderViewImpl* render_view_; |
+ NavigatorDelegate* delegate_; |
- // ProgressMap maps RenderFrame routing ids to a double representing that |
+ // ProgressMap maps RenderFrameHost routing ids to a double representing that |
// frame's completion (from 0 to 1). |
typedef base::hash_map<int, double> ProgressMap; |
ProgressMap progresses_; |
@@ -45,4 +48,4 @@ class LoadProgressTracker { |
} // namespace content |
-#endif // CONTENT_RENDERER_LOAD_PROGRESS_TRACKER_H_ |
+#endif // CONTENT_BROWSER_FRAME_HOST_LOAD_PROGRESS_TRACKER_H_ |