extensions/common/extension.h - Issue 695133005: Temporarily disable extensions and sync while a profile is locked - Profiles Approach

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: extensions/common/extension.h

Issue 695133005: Temporarily disable extensions and sync while a profile is locked - Profiles Approach (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix unit test. Don't lock policy-forced extensions. 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

« extensions/browser/extension_registry.h ('K') | « extensions/browser/extension_registry.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | tools/metrics/histograms/histograms.xml » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/common/extension.h

diff --git a/extensions/common/extension.h b/extensions/common/extension.h

index 4c76478b50de4fb8371c0ba542fa7e5953ef3e3a..942e371ce763185e3e4adb26d13daec76abc713e 100644

--- a/extensions/common/extension.h

+++ b/extensions/common/extension.h

@@ -63,6 +63,7 @@ class Extension : public base::RefCountedThreadSafe<Extension> {

enum State {

DISABLED = 0,

ENABLED,

+ LOCKED,

// An external extension that the user uninstalled. We should not reinstall

// such extensions on startup.

EXTERNAL_EXTENSION_UNINSTALLED,

@@ -539,6 +540,7 @@ struct UnloadedExtensionInfo {

REASON_TERMINATE, // Extension has terminated.

REASON_BLACKLIST, // Extension has been blacklisted.

REASON_PROFILE_SHUTDOWN, // Profile is being shut down.

+ REASON_PROFILE_LOCK, // Profile is being locked.

noms (inactive) 2014/11/12 19:23:51 nit: is being locked or has already been locked?

Mike Lerman 2014/11/12 20:58:42 Re-written.

};

Reason reason;