chrome/browser/profiles/profile_impl.cc - Issue 5213002: Fix for Bug 50726 "Save extension list and "winning" prefs from extensions"

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/profiles/profile_impl.cc

Issue 5213002: Fix for Bug 50726 "Save extension list and "winning" prefs from extensions" (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Same patch but without stuff that is already included in 5204006 Created 10 years 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

« no previous file with comments | « chrome/browser/profiles/profile_impl.h ('k') | chrome/browser/ui/cocoa/extensions/extension_popup_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_impl.cc

diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc

index 71eb5053c44eb926babf9efd5012301f89014959..66b023f768d22e08044eab776ac40cb50d89b851 100644

--- a/chrome/browser/profiles/profile_impl.cc

+++ b/chrome/browser/profiles/profile_impl.cc

@@ -276,6 +276,12 @@ ProfileImpl::ProfileImpl(const FilePath& path)

pref_change_registrar_.Add(prefs::kEnableAutoSpellCorrect, this);

pref_change_registrar_.Add(prefs::kClearSiteDataOnExit, this);

+ // Ensure that preferences set by extensions are restored in the profile

+ // as early as possible. The constructor takes care of that.

+ extension_prefs_.reset(new ExtensionPrefs(

+ GetPrefs(),

+ GetPath().AppendASCII(ExtensionsService::kInstallDirectoryName)));

// Convert active labs into switches. Modifies the current command line.

about_flags::ConvertFlagsToSwitches(prefs, CommandLine::ForCurrentProcess());

@@ -354,6 +360,7 @@ void ProfileImpl::InitExtensions() {

this,

CommandLine::ForCurrentProcess(),

GetPath().AppendASCII(ExtensionsService::kInstallDirectoryName),

+ extension_prefs_.get(),

true);

RegisterComponentExtensions();