chrome/browser/profiles/profile_impl.cc - Issue 8060017: Ensure that --disable-extensions disables extension prefs from being enacted

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 8060017: Ensure that --disable-extensions disables extension prefs from being enacted (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Split ExtensionPrefs constructor into constructor and Init function Created 9 years, 3 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

« no previous file with comments | « chrome/browser/extensions/test_extension_prefs.cc ('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 481b2ef05b6efca8ab25a49e676b5e1ed18c2cb6..466e453643e360de2c0a5a6574cbf6a3054845bd 100644

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

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

@@ -932,12 +932,17 @@ void ProfileImpl::OnPrefsLoaded(bool success) {

// Make sure we save to disk that the session has opened.

prefs_->ScheduleSavePersistentPrefs();

+ bool extensions_disabled =

+ prefs_->GetBoolean(prefs::kDisableExtensions) ||

+ CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableExtensions);

// 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(

prefs_.get(),

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

GetExtensionPrefValueMap()));

+ extension_prefs_->Init(extensions_disabled);

ProfileDependencyManager::GetInstance()->CreateProfileServices(this, false);