chrome/browser/prefs/browser_prefs.cc - Issue 665283002: Fix crash in ChromeZoomLevelPrefs::ExtractPerHostZoomLevels().

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: chrome/browser/prefs/browser_prefs.cc

Issue 665283002: Fix crash in ChromeZoomLevelPrefs::ExtractPerHostZoomLevels(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wjmResetZoomLevel

Patch Set: Convert parameter to bool. Created 6 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: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index fd84b269c4e81713e9e6c5fcb6f26142ac9943b0..874b3ef64696e7cfcaac8077f19b35242e004599 100644

--- a/chrome/browser/prefs/browser_prefs.cc

+++ b/chrome/browser/prefs/browser_prefs.cc

@@ -687,7 +687,10 @@ void MigrateProfileZoomLevelPrefs(Profile* profile) {

migrated |= !host_zoom_dictionary->empty();

UMA_HISTOGRAM_BOOLEAN("Settings.ZoomLevelPreferencesMigrated", migrated);

- zoom_level_prefs->ExtractPerHostZoomLevels(host_zoom_dictionary);

+ // Since |host_zoom_dictionary| is not partition-based, do not attempt to

+ // sanitize it.

+ zoom_level_prefs->ExtractPerHostZoomLevels(

+ host_zoom_dictionary, false /* sanitize_partition_host_zoom_levels */);

// We're done migrating the profile per-host zoom level values, so we clear

// them all.

« no previous file with comments | « no previous file | chrome/browser/ui/zoom/chrome_zoom_level_prefs.h » ('j') | no next file with comments »