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/bookmarks | |
| 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/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_storage.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/bookmarks/bookmark_storage.h b/chrome/browser/bookmarks/bookmark_storage.h index d41b2c5..e3e1337 100644 --- a/chrome/browser/bookmarks/bookmark_storage.h +++ b/chrome/browser/bookmarks/bookmark_storage.h @@ -92,7 +92,6 @@ class BookmarkStorage : public NotificationObserver, // Creates a BookmarkStorage for the specified model BookmarkStorage(Profile* profile, BookmarkModel* model); - ~BookmarkStorage(); // Loads the bookmarks into the model, notifying the model when done. This // takes ownership of |details|. See LoadDetails for details. @@ -109,6 +108,10 @@ class BookmarkStorage : public NotificationObserver, virtual bool SerializeData(std::string* output); private: + friend class base::RefCountedThreadSafe<BookmarkStorage>; + + ~BookmarkStorage(); + class LoadTask; // Callback from backend with the results of the bookmark file. |