Index: chrome/browser/ui/webui/session_favicon_source.cc |
diff --git a/chrome/browser/ui/webui/session_favicon_source.cc b/chrome/browser/ui/webui/session_favicon_source.cc |
index 6d8b5cd99f78adf36d4c591c059fdecc91c4fe29..70591e7cb1ed6a42200bb8feaddad672bfd63919 100644 |
--- a/chrome/browser/ui/webui/session_favicon_source.cc |
+++ b/chrome/browser/ui/webui/session_favicon_source.cc |
@@ -20,26 +20,6 @@ SessionFaviconSource::SessionFaviconSource(Profile* profile) |
SessionFaviconSource::~SessionFaviconSource() { |
} |
-void SessionFaviconSource::StartDataRequest(const std::string& path, |
- bool is_incognito, |
- int request_id) { |
- ProfileSyncService* sync_service = |
- ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile_); |
- SessionModelAssociator* associator = sync_service ? |
- sync_service->GetSessionModelAssociator() : NULL; |
- |
- std::string favicon_data; |
- if (associator && |
- associator->GetSyncedFaviconForPageURL(path, &favicon_data)) { |
- scoped_refptr<base::RefCountedString> response = |
- new base::RefCountedString(); |
- response->data() = favicon_data; |
- SendResponse(request_id, response); |
- } else { |
- FaviconSource::StartDataRequest(path, is_incognito, request_id); |
- } |
-} |
- |
std::string SessionFaviconSource::GetMimeType(const std::string&) const { |
return "image/png"; |
} |
@@ -55,3 +35,22 @@ bool SessionFaviconSource::AllowCaching() const { |
// update in a timely manner. |
return false; |
} |
+ |
+bool SessionFaviconSource::HandleMissingResource(const IconRequest& request) { |
+ ProfileSyncService* sync_service = |
+ ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile_); |
+ SessionModelAssociator* associator = sync_service ? |
+ sync_service->GetSessionModelAssociator() : NULL; |
+ |
+ std::string favicon_data; |
+ if (associator && |
+ associator->GetSyncedFaviconForPageURL(request.request_path, |
+ &favicon_data)) { |
+ scoped_refptr<base::RefCountedString> response = |
+ new base::RefCountedString(); |
+ response->data() = favicon_data; |
+ SendResponse(request.request_id, response); |
+ return true; |
+ } |
+ return false; |
+} |