Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1310)

Unified Diff: chrome/browser/extensions/extension_error_controller.cc

Issue 384423002: [Canceled] Extensions: Add install_flags parameter to ManagementPolicy::UserMayLoad (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update tests Created 6 years, 5 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
Index: chrome/browser/extensions/extension_error_controller.cc
diff --git a/chrome/browser/extensions/extension_error_controller.cc b/chrome/browser/extensions/extension_error_controller.cc
index 8ae3154ad6f7191784f914a23bd6fac731c05390..995b23ad8517d5148a9ffb8c4073a75296a5c611 100644
--- a/chrome/browser/extensions/extension_error_controller.cc
+++ b/chrome/browser/extensions/extension_error_controller.cc
@@ -128,7 +128,9 @@ void ExtensionErrorController::IdentifyAlertableExtensions() {
// Extensions disabled by policy. Note: this no longer includes blacklisted
// extensions, though we still show the same UI.
- if (!management_policy->UserMayLoad(extension, NULL /* ignore error */)) {
+ int install_flags = prefs->GetInstallFlags(extension->id());
+ if (!management_policy->UserMayLoad(
+ extension, install_flags, NULL /* ignore error */)) {
if (!prefs->IsBlacklistedExtensionAcknowledged(extension->id()))
blacklisted_extensions_.Insert(extension);
}
« no previous file with comments | « chrome/browser/extensions/crx_installer_browsertest.cc ('k') | chrome/browser/extensions/extension_install_checker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698