diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-06 08:32:17 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-06 08:32:17 +0000 |
| commit | 8de85a60ef3c615360d0c644f7f16f9a13103865 (patch) | |
| tree | 0ac8ff6a33b4b70c868015fb50b16c08f92d5018 /chrome/browser/dom_ui/fileicon_source.h | |
| parent | 716984c61da9f5a8ac8158d122e50646081f5b6e (diff) | |
| download | chromium_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/dom_ui/fileicon_source.h')
| -rw-r--r-- | chrome/browser/dom_ui/fileicon_source.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/dom_ui/fileicon_source.h b/chrome/browser/dom_ui/fileicon_source.h index a13c207..a9f43d7 100644 --- a/chrome/browser/dom_ui/fileicon_source.h +++ b/chrome/browser/dom_ui/fileicon_source.h @@ -18,7 +18,6 @@ class GURL; class FileIconSource : public ChromeURLDataManager::DataSource { public: explicit FileIconSource(); - virtual ~FileIconSource(); // Called when the network layer has requested a resource underneath // the path we registered. @@ -35,6 +34,8 @@ class FileIconSource : public ChromeURLDataManager::DataSource { SkBitmap* icon); private: + virtual ~FileIconSource(); + CancelableRequestConsumerT<int, 0> cancelable_consumer_; // Raw PNG representation of the favicon to show when the favicon |