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 a3d5fa7a5115bf0a63a3a05c5e35ca2a2eda9ec5..db8e6517fb988c5952e4d4edcb947ea22e34b52a 100644 |
--- a/chrome/browser/favicon/favicon_tab_helper.cc |
+++ b/chrome/browser/favicon/favicon_tab_helper.cc |
@@ -175,6 +175,7 @@ void FaviconTabHelper::NavigateToPendingEntry( |
void FaviconTabHelper::DidNavigateMainFrame( |
const content::LoadCommittedDetails& details, |
const content::FrameNavigateParams& params) { |
+ favicon_urls_.reset(); |
// Get the favicon, either from history or request it from the net. |
FetchFavicon(details.entry->GetURL()); |
} |
@@ -182,6 +183,8 @@ void FaviconTabHelper::DidNavigateMainFrame( |
void FaviconTabHelper::DidUpdateFaviconURL( |
int32 page_id, |
const std::vector<content::FaviconURL>& candidates) { |
+ favicon_urls_.reset(new std::vector<content::FaviconURL>(candidates)); |
+ |
favicon_handler_->OnUpdateFaviconURL(page_id, candidates); |
if (touch_icon_handler_.get()) |
touch_icon_handler_->OnUpdateFaviconURL(page_id, candidates); |