diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-29 16:35:13 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-01 15:33:35 +0000 |
commit | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (patch) | |
tree | 9157c3d9815e5870799e070b113813bec53e0535 /chromium/components/sync_sessions | |
parent | abefd5095b41dac94ca451d784ab6e27372e981a (diff) | |
download | qtwebengine-chromium-c8c2d1901aec01e934adf561a9fdf0cc776cdef8.tar.gz |
BASELINE: Update Chromium to 64.0.3282.139
Change-Id: I1cae68fe9c94ff7608b26b8382fc19862cdb293a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/components/sync_sessions')
-rw-r--r-- | chromium/components/sync_sessions/favicon_cache.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/components/sync_sessions/favicon_cache.cc b/chromium/components/sync_sessions/favicon_cache.cc index 5814ca94547..72c319ff07a 100644 --- a/chromium/components/sync_sessions/favicon_cache.cc +++ b/chromium/components/sync_sessions/favicon_cache.cc @@ -78,7 +78,9 @@ const int kMaxFaviconResolution = 16; // Returns a mask of the supported favicon types. // TODO(zea): Supporting other favicons types will involve some work in the // favicon service and navigation controller. See crbug.com/181068. -int SupportedFaviconTypes() { return favicon_base::FAVICON; } +favicon_base::IconTypeSet SupportedFaviconTypes() { + return {favicon_base::IconType::kFavicon}; +} // Returns the appropriate IconSize to use for a given gfx::Size pixel // dimensions. |