summaryrefslogtreecommitdiff
path: root/chromium/content/renderer/load_progress_tracker.h
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-03-18 13:16:26 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-03-20 15:55:39 +0100
commit3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch)
tree92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/content/renderer/load_progress_tracker.h
parente90d7c4b152c56919d963987e2503f9909a666d2 (diff)
downloadqtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies needed on Windows. Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42 Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/content/renderer/load_progress_tracker.h')
-rw-r--r--chromium/content/renderer/load_progress_tracker.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/content/renderer/load_progress_tracker.h b/chromium/content/renderer/load_progress_tracker.h
index a23935027d1..c4ed37eca9d 100644
--- a/chromium/content/renderer/load_progress_tracker.h
+++ b/chromium/content/renderer/load_progress_tracker.h
@@ -9,7 +9,7 @@
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
-namespace WebKit {
+namespace blink {
class WebFrame;
}
@@ -23,7 +23,7 @@ class LoadProgressTracker {
void DidStopLoading();
- void DidChangeLoadProgress(WebKit::WebFrame* frame, double progress);
+ void DidChangeLoadProgress(blink::WebFrame* frame, double progress);
private:
void ResetStates();
@@ -32,7 +32,7 @@ class LoadProgressTracker {
RenderViewImpl* render_view_;
- WebKit::WebFrame* tracked_frame_;
+ blink::WebFrame* tracked_frame_;
double progress_;