summaryrefslogtreecommitdiffstats
path: root/content/renderer/load_progress_tracker.cc
diff options
context:
space:
mode:
authortedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-16 01:46:26 +0000
committertedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-16 01:46:26 +0000
commit14b95f1e35ee10b56b0ec6b88d2f563d5c14e99b (patch)
treebf18cab4afa4013ece3600c10daadaeb62428291 /content/renderer/load_progress_tracker.cc
parent24469df740672071da7cb0a44386fff9d9cacb7f (diff)
downloadchromium_src-14b95f1e35ee10b56b0ec6b88d2f563d5c14e99b.zip
chromium_src-14b95f1e35ee10b56b0ec6b88d2f563d5c14e99b.tar.gz
chromium_src-14b95f1e35ee10b56b0ec6b88d2f563d5c14e99b.tar.bz2
Convert use of int ms to TimeDelta in files owned by brettw.
R=brettw@chromium.org BUG=108171 TEST= Review URL: http://codereview.chromium.org/9185026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/load_progress_tracker.cc')
-rw-r--r--content/renderer/load_progress_tracker.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/content/renderer/load_progress_tracker.cc b/content/renderer/load_progress_tracker.cc
index cc153f6..b7a14ba 100644
--- a/content/renderer/load_progress_tracker.cc
+++ b/content/renderer/load_progress_tracker.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -51,9 +51,11 @@ void LoadProgressTracker::DidChangeLoadProgress(WebKit::WebFrame* frame,
// last updates. Also, since the message loop may be pretty busy when a page
// is loaded, it might not execute a posted task in a timely manner so we make
// sure to immediately send progress report if enough time has passed.
+ base::TimeDelta min_delay =
+ base::TimeDelta::FromMilliseconds(kMinimumDelayBetweenUpdatesMS);
if (progress == 1.0 || last_time_progress_sent_.is_null() ||
- (base::TimeTicks::Now() - last_time_progress_sent_).InMilliseconds() >
- kMinimumDelayBetweenUpdatesMS) {
+ base::TimeTicks::Now() - last_time_progress_sent_ >
+ min_delay) {
// If there is a pending task to send progress, it is now obsolete.
weak_factory_.InvalidateWeakPtrs();
SendChangeLoadProgress();
@@ -69,7 +71,7 @@ void LoadProgressTracker::DidChangeLoadProgress(WebKit::WebFrame* frame,
FROM_HERE,
base::Bind(&LoadProgressTracker::SendChangeLoadProgress,
weak_factory_.GetWeakPtr()),
- kMinimumDelayBetweenUpdatesMS);
+ min_delay);
}
void LoadProgressTracker::SendChangeLoadProgress() {