chrome/browser/extensions/extension_service.h - Issue 10854009: Extension white and force lists (set by policy) should have priority over auto-updated Google black…

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/extension_service.h

Issue 10854009: Extension white and force lists (set by policy) should have priority over auto-updated Google black… (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Removed loop_.RunAllPending(); Created 8 years, 4 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

« chrome/browser/extensions/extension_prefs.cc ('K') | « chrome/browser/extensions/extension_prefs_unittest.cc ('k') | chrome/browser/extensions/extension_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_service.h

diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h

index c326490a1a8cb6f32e3d039fe3a0dcb5e02b4897..08b31e6630c2f17e1a3e2cb7ca1baabfb7d01766 100644

--- a/chrome/browser/extensions/extension_service.h

+++ b/chrome/browser/extensions/extension_service.h

@@ -121,7 +121,7 @@ class ExtensionServiceInterface : public syncer::SyncableService {

virtual void UpdateExtensionBlacklist(

const std::vector<std::string>& blacklist) = 0;

- virtual void CheckAdminBlacklist() = 0;

+ virtual void CheckManagementPolicy() = 0;

// Safe to call multiple times in a row.

@@ -413,10 +413,10 @@ class ExtensionService

virtual void UpdateExtensionBlacklist(

const std::vector<std::string>& blacklist) OVERRIDE;

- // Go through each extension and unload those that the network admin has

- // put on the blacklist (not to be confused with the Google-managed blacklist)

- // set of extensions.

- virtual void CheckAdminBlacklist() OVERRIDE;

+ // Go through each extension and unload those that are not allowed to run by

+ // management policy providers (ie. network admin and Google-managed

+ // blacklist).

+ virtual void CheckManagementPolicy() OVERRIDE;

virtual void CheckForUpdatesSoon() OVERRIDE;