Chromium Code Reviews| Index: components/favicon/content/content_favicon_driver.cc |
| diff --git a/components/favicon/content/content_favicon_driver.cc b/components/favicon/content/content_favicon_driver.cc |
| index c8efaad86bfabb2d53b7d944f38c1bb28212b9c8..5f4abc72008275d9620946c6fc8c9184332a6e33 100644 |
| --- a/components/favicon/content/content_favicon_driver.cc |
| +++ b/components/favicon/content/content_favicon_driver.cc |
| @@ -84,13 +84,13 @@ bool ContentFaviconDriver::IsOffTheRecord() { |
| GURL ContentFaviconDriver::GetActiveURL() { |
|
tfarina
2015/06/30 21:22:55
Nasko, I guess you want me to rename this and GetA
tfarina
2015/06/30 21:22:55
Should I rename it to GetLastCommittedURL()?
nasko
2015/07/01 05:56:30
Ideally, this should be renamed, but there are man
|
| content::NavigationEntry* entry = |
| - web_contents()->GetController().GetActiveEntry(); |
| + web_contents()->GetController().GetLastCommittedEntry(); |
|
nasko
2015/07/01 05:56:30
Let's watch for failures/bugs from this CL once it
sdefresne
2015/08/13 09:12:26
drive-by: on iOS we are using GetVisibleItem() eve
|
| return entry ? entry->GetURL() : GURL(); |
| } |
| base::string16 ContentFaviconDriver::GetActiveTitle() { |
| content::NavigationEntry* entry = |
| - web_contents()->GetController().GetActiveEntry(); |
| + web_contents()->GetController().GetLastCommittedEntry(); |
| return entry ? entry->GetTitle() : base::string16(); |
| } |
| @@ -119,8 +119,8 @@ void ContentFaviconDriver::SetActiveFaviconImage(const gfx::Image& image) { |
| } |
| content::FaviconStatus& ContentFaviconDriver::GetFaviconStatus() { |
| - DCHECK(web_contents()->GetController().GetActiveEntry()); |
| - return web_contents()->GetController().GetActiveEntry()->GetFavicon(); |
| + DCHECK(web_contents()->GetController().GetLastCommittedEntry()); |
| + return web_contents()->GetController().GetLastCommittedEntry()->GetFavicon(); |
| } |
| ContentFaviconDriver::ContentFaviconDriver( |