chrome/browser/protector/protected_prefs_watcher.cc - Issue 10702040: Cleanup & tests for the mac startup pref migration.

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/protector/protected_prefs_watcher.cc

Issue 10702040: Cleanup & tests for the mac startup pref migration. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

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

Index: chrome/browser/protector/protected_prefs_watcher.cc

diff --git a/chrome/browser/protector/protected_prefs_watcher.cc b/chrome/browser/protector/protected_prefs_watcher.cc

index a58a9934a6d4a02a011f3b0e04ff933c0a4643b5..9ae1a8a4febb6a3d1c22a1f3d6d6aa93f11c5f68 100644

--- a/chrome/browser/protector/protected_prefs_watcher.cc

+++ b/chrome/browser/protector/protected_prefs_watcher.cc

@@ -195,6 +195,7 @@ void ProtectedPrefsWatcher::Observe(

void ProtectedPrefsWatcher::EnsurePrefsMigration() {

SessionStartupPref::MigrateIfNecessary(profile_->GetPrefs());

+ SessionStartupPref::MigrateMacDefaultPrefIfNecessary(profile_->GetPrefs());

}

bool ProtectedPrefsWatcher::UpdateCachedPrefs() {