chrome/browser/extensions/installed_loader.cc - Issue 384423002: [Canceled] Extensions: Add install_flags parameter to ManagementPolicy::UserMayLoad

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/extensions/installed_loader.cc

Issue 384423002: [Canceled] Extensions: Add install_flags parameter to ManagementPolicy::UserMayLoad (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: update tests Created 6 years, 5 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/extension_service.cc ('k') | chrome/browser/extensions/standard_management_policy_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/installed_loader.cc

diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc

index 062ef79ac7dff4035dbdb8993328fd184b9a5786..393c99b882032ae228209c684b58e2498778d658 100644

--- a/chrome/browser/extensions/installed_loader.cc

+++ b/chrome/browser/extensions/installed_loader.cc

@@ -174,7 +174,8 @@ void InstalledLoader::Load(const ExtensionInfo& info, bool write_to_prefs) {

if (extension.get()) {

Extension::DisableReason disable_reason = Extension::DISABLE_NONE;

bool force_disabled = false;

- if (!policy->UserMayLoad(extension.get(), NULL)) {

+ int install_flags = extension_prefs_->GetInstallFlags(extension->id());

+ if (!policy->UserMayLoad(extension.get(), install_flags, NULL)) {

// The error message from UserMayInstall() often contains the extension ID

// and is therefore not well suited to this UI.

error = errors::kDisabledByPolicy;

« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/extensions/standard_management_policy_provider.h » ('j') | no next file with comments »