components/favicon/core/favicon_handler.cc - Issue 1399913002: Stop FaviconHandler from querying GetActiveFaviconValidity() part 2/2

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/favicon/core/favicon_handler.cc

Issue 1399913002: Stop FaviconHandler from querying GetActiveFaviconValidity() part 2/2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@favicon_remove_validity_check

Patch Set: Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: components/favicon/core/favicon_handler.cc

diff --git a/components/favicon/core/favicon_handler.cc b/components/favicon/core/favicon_handler.cc

index d8ec1eaa58ad193058466179d9994f3914679129..3d15052e29d3d3b2bacc6f005d75a7c280201738 100644

--- a/components/favicon/core/favicon_handler.cc

+++ b/components/favicon/core/favicon_handler.cc

@@ -568,8 +568,7 @@ void FaviconHandler::OnFaviconDataForInitialURLFromFaviconService(

preferred_icon_size(), favicon_bitmap_results);

bool has_valid_result = HasValidResult(favicon_bitmap_results);

- if (has_results && handler_type_ == FAVICON &&

- !download_largest_icon_ && !driver_->GetActiveFaviconValidity() &&

+ if (has_results && handler_type_ == FAVICON && !download_largest_icon_ &&

(!current_candidate() ||

DoUrlsAndIconsMatch(*current_candidate(), favicon_bitmap_results))) {

if (has_valid_result) {

« no previous file with comments | « components/favicon/core/favicon_driver.h ('k') | components/favicon/core/favicon_handler_unittest.cc » ('j') | no next file with comments »