Index: chrome/browser/favicon/favicon_tab_helper.cc |
diff --git a/chrome/browser/favicon/favicon_tab_helper.cc b/chrome/browser/favicon/favicon_tab_helper.cc |
index daf95b1f4aa858b1cd5f9d83a74e76b36dce85c0..9450596420f343bff154f2c342c735f54c1c86f8 100644 |
--- a/chrome/browser/favicon/favicon_tab_helper.cc |
+++ b/chrome/browser/favicon/favicon_tab_helper.cc |
@@ -39,11 +39,11 @@ FaviconTabHelper::FaviconTabHelper(WebContents* web_contents) |
: content::WebContentsObserver(web_contents), |
driver_(web_contents), |
profile_(Profile::FromBrowserContext(web_contents->GetBrowserContext())) { |
- favicon_handler_.reset( |
- new FaviconHandler(profile_, &driver_, this, FaviconHandler::FAVICON)); |
+ favicon_handler_.reset(new FaviconHandler( |
+ profile_, this, &driver_, this, FaviconHandler::FAVICON)); |
if (chrome::kEnableTouchIcon) |
- touch_icon_handler_.reset( |
- new FaviconHandler(profile_, &driver_, this, FaviconHandler::TOUCH)); |
+ touch_icon_handler_.reset(new FaviconHandler( |
+ profile_, this, &driver_, this, FaviconHandler::TOUCH)); |
} |
FaviconTabHelper::~FaviconTabHelper() { |
@@ -188,6 +188,11 @@ void FaviconTabHelper::DidUpdateFaviconURL( |
touch_icon_handler_->OnUpdateFaviconURL(page_id, candidates); |
} |
+FaviconService* FaviconTabHelper::GetFaviconService() { |
+ return FaviconServiceFactory::GetForProfile(profile_, |
+ Profile::EXPLICIT_ACCESS); |
+} |
+ |
void FaviconTabHelper::DidDownloadFavicon( |
int id, |
int http_status_code, |