From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/components/sync_bookmarks/switches.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'chromium/components/sync_bookmarks/switches.cc') diff --git a/chromium/components/sync_bookmarks/switches.cc b/chromium/components/sync_bookmarks/switches.cc index 13fe6995911..1617ec0c49a 100644 --- a/chromium/components/sync_bookmarks/switches.cc +++ b/chromium/components/sync_bookmarks/switches.cc @@ -7,8 +7,7 @@ namespace switches { const base::Feature kSyncDoNotCommitBookmarksWithoutFavicon = { - "SyncDoNotCommitBookmarksWithoutFavicon", - base::FEATURE_DISABLED_BY_DEFAULT}; + "SyncDoNotCommitBookmarksWithoutFavicon", base::FEATURE_ENABLED_BY_DEFAULT}; // Enables updating a BookmarkNode's GUID by replacing the node itself. const base::Feature kUpdateBookmarkGUIDWithNodeReplacement{ @@ -29,4 +28,7 @@ const base::Feature kSyncDeduplicateAllBookmarksWithSameGUID{ "SyncDeduplicateAllBookmarksWithSameGUID", base::FEATURE_ENABLED_BY_DEFAULT}; +const base::Feature kSyncIgnoreChangesInTouchIcons{ + "SyncIgnoreChangesInTouchIcons", base::FEATURE_ENABLED_BY_DEFAULT}; + } // namespace switches -- cgit v1.2.1