chrome/browser/extensions/extension_service.cc - Issue 353493002: Apps&Extensions for supervised users: Add Extension::WAS_INSTALLED_BY_CUSTODIAN flag and proto entry

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

Issue 353493002: Apps&Extensions for supervised users: Add Extension::WAS_INSTALLED_BY_CUSTODIAN flag and proto entry (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: update test Created 6 years, 6 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/app_sync_data_unittest.cc ('k') | chrome/browser/extensions/extension_service_unittest.cc » ('j') | chrome/browser/themes/theme_syncable_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_service.cc

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

index ee810bfcd62dd2271a6cab07763deed1856111c7..43ea865acd487a9d185b5900b4d1bdf72e07fdf0 100644

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

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

@@ -581,6 +581,9 @@ bool ExtensionService::UpdateExtension(const std::string& id,

if (extension && extension->was_installed_by_oem())

creation_flags |= Extension::WAS_INSTALLED_BY_OEM;

+ if (extension && extension->was_installed_by_custodian())

+ creation_flags |= Extension::WAS_INSTALLED_BY_CUSTODIAN;

if (extension) {

installer->set_is_ephemeral(extension_prefs_->IsEphemeralApp(id));

installer->set_do_not_sync(extension_prefs_->DoNotSync(id));