diff options
| author | rlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-23 22:27:59 +0000 |
|---|---|---|
| committer | rlp@chromium.org <rlp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-23 22:27:59 +0000 |
| commit | f3d2b314224e8859118edae4f3f0554147ecb7f2 (patch) | |
| tree | d40e9cfcb3f1522288513b7c54b5604b6f72dcd3 /chrome/browser/jumplist_win.cc | |
| parent | 25a2cee0a19bc494cbfef64a8b23fba50949a11f (diff) | |
| download | chromium_src-f3d2b314224e8859118edae4f3f0554147ecb7f2.zip chromium_src-f3d2b314224e8859118edae4f3f0554147ecb7f2.tar.gz chromium_src-f3d2b314224e8859118edae4f3f0554147ecb7f2.tar.bz2 | |
Moving FaviconService to a ProfileKeyedService.
BUG=112526
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=152904
Reverted, was not the cause of problem. Resubmitting.
Review URL: https://chromiumcodereview.appspot.com/10828263
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/jumplist_win.cc')
| -rw-r--r-- | chrome/browser/jumplist_win.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc index ddf53be..d66c0da 100644 --- a/chrome/browser/jumplist_win.cc +++ b/chrome/browser/jumplist_win.cc @@ -23,6 +23,7 @@ #include "base/win/scoped_comptr.h" #include "base/win/windows_version.h" #include "chrome/browser/favicon/favicon_service.h" +#include "chrome/browser/favicon/favicon_service_factory.h" #include "chrome/browser/history/history.h" #include "chrome/browser/history/page_usage_data.h" #include "chrome/browser/history/top_sites.h" @@ -574,8 +575,8 @@ void JumpList::RemoveObserver() { void JumpList::CancelPendingUpdate() { if (handle_) { - FaviconService* favicon_service = - profile_->GetFaviconService(Profile::EXPLICIT_ACCESS); + FaviconService* favicon_service = FaviconServiceFactory::GetForProfile( + profile_, Profile::EXPLICIT_ACCESS); favicon_service->CancelRequest(handle_); handle_ = NULL; } @@ -699,9 +700,9 @@ bool JumpList::StartLoadingFavicon() { url = GURL(icon_urls_.front().first); } FaviconService* favicon_service = - profile_->GetFaviconService(Profile::EXPLICIT_ACCESS); + FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS); handle_ = favicon_service->GetFaviconForURL( - url, history::FAVICON, &favicon_consumer_, + profile_, url, history::FAVICON, &favicon_consumer_, base::Bind(&JumpList::OnFaviconDataAvailable, base::Unretained(this))); return true; } |