components/favicon/core/favicon_handler.cc - Issue 1118073002: Simplify FaviconDriverImpl by removing extra FaviconHandler member.

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 1118073002: Simplify FaviconDriverImpl by removing extra FaviconHandler member. Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 8 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

« components/favicon/core/favicon_handler.h ('K') | « components/favicon/core/favicon_handler.h ('k') | components/favicon/core/favicon_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/favicon/core/favicon_handler.cc

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

index 3befa3491828e4e127d74984f61048540b62d2a7..0929c4eb0f548e6a4d2cfdc7892d7264e133b9a8 100644

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

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

@@ -225,8 +225,7 @@ int FaviconHandler::GetIconTypesFromHandlerType(

switch (handler_type) {

case FAVICON:

return favicon_base::FAVICON;

- case TOUCH: // Falls through.

- case LARGE:

+ case TOUCH:

return favicon_base::TOUCH_ICON | favicon_base::TOUCH_PRECOMPOSED_ICON;

default:

NOTREACHED();

@@ -545,6 +544,8 @@ int FaviconHandler::GetMaximalIconSize(favicon_base::IconType icon_type) {

#if defined(OS_ANDROID)

huangs 2015/04/30 20:23:41 Can we remove the OS_ANDROID case?

return 192;

#else

+ if (download_largest_icon_)

+ return 192;

return gfx::ImageSkia::GetMaxSupportedScale() * gfx::kFaviconSize;

#endif

case favicon_base::TOUCH_ICON:

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