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/bookmarks/bookmark_model.cc | |
| 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/bookmarks/bookmark_model.cc')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_model.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index fcdea2f..b6497a0 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -18,7 +18,6 @@ #include "chrome/browser/bookmarks/bookmark_storage.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/history/history_notifications.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/prefs/pref_service.h" @@ -780,8 +779,7 @@ void BookmarkModel::OnFaviconDataAvailable( history::FaviconData favicon) { BookmarkNode* node = load_consumer_.GetClientData( - FaviconServiceFactory::GetForProfile( - profile_, Profile::EXPLICIT_ACCESS), handle); + profile_->GetFaviconService(Profile::EXPLICIT_ACCESS), handle); DCHECK(node); node->set_favicon_load_handle(0); if (favicon.is_valid()) { @@ -800,12 +798,12 @@ void BookmarkModel::LoadFavicon(BookmarkNode* node) { return; DCHECK(node->url().is_valid()); - FaviconService* favicon_service = FaviconServiceFactory::GetForProfile( - profile_, Profile::EXPLICIT_ACCESS); + FaviconService* favicon_service = + profile_->GetFaviconService(Profile::EXPLICIT_ACCESS); if (!favicon_service) return; FaviconService::Handle handle = favicon_service->GetFaviconForURL( - profile_, node->url(), history::FAVICON, &load_consumer_, + node->url(), history::FAVICON, &load_consumer_, base::Bind(&BookmarkModel::OnFaviconDataAvailable, base::Unretained(this))); load_consumer_.SetClientData(favicon_service, handle, node); @@ -819,8 +817,8 @@ void BookmarkModel::FaviconLoaded(const BookmarkNode* node) { void BookmarkModel::CancelPendingFaviconLoadRequests(BookmarkNode* node) { if (node->favicon_load_handle()) { - FaviconService* favicon_service = FaviconServiceFactory::GetForProfile( - profile_, Profile::EXPLICIT_ACCESS); + FaviconService* favicon_service = + profile_->GetFaviconService(Profile::EXPLICIT_ACCESS); if (favicon_service) favicon_service->CancelRequest(node->favicon_load_handle()); node->set_favicon_load_handle(0); |