summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/image_loading_tracker.h
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 08:32:17 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 08:32:17 +0000
commit8de85a60ef3c615360d0c644f7f16f9a13103865 (patch)
tree0ac8ff6a33b4b70c868015fb50b16c08f92d5018 /chrome/browser/extensions/image_loading_tracker.h
parent716984c61da9f5a8ac8158d122e50646081f5b6e (diff)
downloadchromium_src-8de85a60ef3c615360d0c644f7f16f9a13103865.zip
chromium_src-8de85a60ef3c615360d0c644f7f16f9a13103865.tar.gz
chromium_src-8de85a60ef3c615360d0c644f7f16f9a13103865.tar.bz2
Revert "Revert r31175 r31176 r31187"
The bustage seems to be a WebKit change upstream. It is not reverted in WebKit and merger. So bring the innocent change back in. TBR=jam TEST=green tree Review URL: http://codereview.chromium.org/375009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31214 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/image_loading_tracker.h')
-rw-r--r--chrome/browser/extensions/image_loading_tracker.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/extensions/image_loading_tracker.h b/chrome/browser/extensions/image_loading_tracker.h
index a56aaeb..23f7b71 100644
--- a/chrome/browser/extensions/image_loading_tracker.h
+++ b/chrome/browser/extensions/image_loading_tracker.h
@@ -37,7 +37,6 @@ class ImageLoadingTracker
// get deleted until we get a response from image loading (see
// ImageLoadingDone).
}
- ~ImageLoadingTracker() {}
// If there are remaining images to be loaded, the observing object should
// call this method on its destruction, so that the tracker will not attempt
@@ -56,6 +55,10 @@ class ImageLoadingTracker
private:
class LoadImageTask;
+ friend class base::RefCountedThreadSafe<ImageLoadingTracker>;
+
+ ~ImageLoadingTracker() {}
+
// When an image has finished loaded and scaled on the file thread, it is
// posted back to this method on the original thread. This method then calls
// the observer's OnImageLoaded and deletes the ImageLoadingTracker if it was