chrome/browser/extensions/standard_management_policy_provider.cc - Issue 671943003: Add update url controlled extension management settings

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/standard_management_policy_provider.cc

Issue 671943003: Add update url controlled extension management settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ext-5

Patch Set: fixes addressing #3 Created 6 years, 1 month 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/permissions_based_management_policy_provider.cc ('k') | components/policy/resources/policy_templates.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/standard_management_policy_provider.cc

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

index b99fe65e10b0b9c444e2616976228c8cb1e4e646..0ad9c7db1cbf49968f10f3a011939510723b5ecf 100644

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

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

@@ -83,7 +83,7 @@ bool StandardManagementPolicyProvider::UserMayLoad(

return true;

ExtensionManagement::InstallationMode installation_mode =

- settings_->GetInstallationMode(extension->id());

+ settings_->GetInstallationMode(extension);

// Force-installed extensions cannot be overwritten manually.

if (!Manifest::IsPolicyLocation(extension->location()) &&

@@ -142,7 +142,7 @@ bool StandardManagementPolicyProvider::MustRemainInstalled(

const Extension* extension,

base::string16* error) const {

ExtensionManagement::InstallationMode mode =

- settings_->GetInstallationMode(extension->id());

+ settings_->GetInstallationMode(extension);

// Disallow removing of recommended extension, to avoid re-install it

// again while policy is reload. But disabling of recommended extension is

// allowed.