diff options
| author | ricow@chromium.org <ricow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-23 06:58:39 +0000 |
|---|---|---|
| committer | ricow@chromium.org <ricow@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-23 06:58:39 +0000 |
| commit | 8c715080dced54bec5d13862ed6a0da9974405e8 (patch) | |
| tree | 56419cd3184ee559d34e718358ca67302b320b48 /chrome/browser/importer | |
| parent | 85b667621215f8a8e97abc641c7ec88bfe84587c (diff) | |
| download | chromium_src-8c715080dced54bec5d13862ed6a0da9974405e8.zip chromium_src-8c715080dced54bec5d13862ed6a0da9974405e8.tar.gz chromium_src-8c715080dced54bec5d13862ed6a0da9974405e8.tar.bz2 | |
Revert 152904 - Moving FaviconService to a ProfileKeyedService.
BUG=112526
Review URL: https://chromiumcodereview.appspot.com/10828263
This seems to be causing win7 sync issues.
TBR=rlp@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10873022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
| -rw-r--r-- | chrome/browser/importer/profile_writer.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc index e7a6d20..d7f6280 100644 --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -14,7 +14,6 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" -#include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/password_manager/password_store.h" #include "chrome/browser/password_manager/password_store_factory.h" @@ -233,7 +232,7 @@ void ProfileWriter::AddBookmarks(const std::vector<BookmarkEntry>& bookmarks, void ProfileWriter::AddFavicons( const std::vector<history::ImportedFaviconUsage>& favicons) { - FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS)-> + profile_->GetFaviconService(Profile::EXPLICIT_ACCESS)-> SetImportedFavicons(favicons); } |