chrome/browser/ui/extensions/extension_enable_flow.cc - Issue 925563002: Supervised users: Slightly relax restrictions around extensions.

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

Issue 925563002: Supervised users: Slightly relax restrictions around extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@test_ext_install_disable

Patch Set: rebase Created 5 years, 10 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/supervised_user/supervised_user_service_unittest.cc ('k') | chrome/browser/ui/webui/extensions/extension_settings_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/extensions/extension_enable_flow.cc

diff --git a/chrome/browser/ui/extensions/extension_enable_flow.cc b/chrome/browser/ui/extensions/extension_enable_flow.cc

index 8e305e7931f2e8d5f8ca71187691b3ccf6e5c91c..208f72a9136c4e6c508f4c8aa0964f750d5afce2 100644

--- a/chrome/browser/ui/extensions/extension_enable_flow.cc

+++ b/chrome/browser/ui/extensions/extension_enable_flow.cc

@@ -6,6 +6,7 @@

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/extensions/extension_service.h"

+#include "chrome/browser/extensions/extension_util.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h"

#include "content/public/browser/notification_details.h"

@@ -87,6 +88,12 @@ void ExtensionEnableFlow::CheckPermissionAndMaybePromptUser() {

return;

}

+ // Supervised users can't re-enable custodian-installed extensions.

+ if (extensions::util::IsExtensionSupervised(extension, profile_)) {

+ delegate_->ExtensionEnableFlowAborted(false); // |delegate_| may delete us.

+ return;

+ }

extensions::ExtensionPrefs* prefs = extensions::ExtensionPrefs::Get(profile_);

if (!prefs->DidExtensionEscalatePermissions(extension_id_)) {

// Enable the extension immediately if its privileges weren't escalated.