diff options
author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-06 03:28:20 +0000 |
---|---|---|
committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-06 03:28:20 +0000 |
commit | 08ffa6bd4032c34c135d23b47276c0a83ab34f76 (patch) | |
tree | 3e5cd86f532dc04214b70ed10886c5cb16b3aeb7 /chrome/browser/bookmarks | |
parent | a5971dc68d14d4cb063c10138133483a14cd7530 (diff) | |
download | chromium_src-08ffa6bd4032c34c135d23b47276c0a83ab34f76.zip chromium_src-08ffa6bd4032c34c135d23b47276c0a83ab34f76.tar.gz chromium_src-08ffa6bd4032c34c135d23b47276c0a83ab34f76.tar.bz2 |
Rever r31175 r31176 r31187
XP tests are failing, the guess is r31175 and r31176.
TBR=beng
TEST=XP tests go green
Review URL: http://codereview.chromium.org/376008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
-rw-r--r-- | chrome/browser/bookmarks/bookmark_storage.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/bookmarks/bookmark_storage.h b/chrome/browser/bookmarks/bookmark_storage.h index e3e1337..d41b2c5 100644 --- a/chrome/browser/bookmarks/bookmark_storage.h +++ b/chrome/browser/bookmarks/bookmark_storage.h @@ -92,6 +92,7 @@ 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. @@ -108,10 +109,6 @@ 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. |