| Index: chrome/browser/favicon/favicon_service.h
|
| diff --git a/chrome/browser/favicon/favicon_service.h b/chrome/browser/favicon/favicon_service.h
|
| index ed1bc3d249530c8c511cd3dbd45d4e6279ec072c..0e5698f333a85d756bbca4d099cae3c19994dc3c 100644
|
| --- a/chrome/browser/favicon/favicon_service.h
|
| +++ b/chrome/browser/favicon/favicon_service.h
|
| @@ -34,22 +34,19 @@ struct FaviconImageResult;
|
| class FaviconService : public CancelableRequestProvider,
|
| public BrowserContextKeyedService {
|
| public:
|
| - explicit FaviconService(HistoryService* history_service);
|
| + explicit FaviconService(Profile* profile);
|
|
|
| virtual ~FaviconService();
|
|
|
| // Auxiliary argument structure for requesting favicons for URLs.
|
| struct FaviconForURLParams {
|
| - FaviconForURLParams(Profile* profile,
|
| - const GURL& page_url,
|
| + FaviconForURLParams(const GURL& page_url,
|
| int icon_types,
|
| int desired_size_in_dip)
|
| - : profile(profile),
|
| - page_url(page_url),
|
| + : page_url(page_url),
|
| icon_types(icon_types),
|
| desired_size_in_dip(desired_size_in_dip) {}
|
|
|
| - Profile* profile;
|
| GURL page_url;
|
| int icon_types;
|
| int desired_size_in_dip;
|
| @@ -243,7 +240,8 @@ class FaviconService : public CancelableRequestProvider,
|
| private:
|
| typedef uint32 MissingFaviconURLHash;
|
| base::hash_set<MissingFaviconURLHash> missing_favicon_urls_;
|
| - HistoryService* history_service_;
|
| + scoped_ptr<HistoryService> history_service_;
|
| + Profile* profile_;
|
|
|
| // Helper function for GetFaviconImageForURL(), GetRawFaviconForURL() and
|
| // GetFaviconForURL().
|
|
|