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