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

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

Issue 10542023: Disable modifying extensions when in managed mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fixed Evan's nits Created 8 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/management_policy.h ('k') | chrome/browser/extensions/test_management_policy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/management_policy.cc
===================================================================
--- chrome/browser/extensions/management_policy.cc (revision 142678)
+++ chrome/browser/extensions/management_policy.cc (working copy)
@@ -41,8 +41,10 @@
if (!(*it)->UserMayLoad(extension, error)) {
// The extension may be NULL in testing.
std::string id = extension ? extension->id() : "[test]";
- DLOG(WARNING) << "Installation of extension " << id
- << " prohibited by " << (*it)->GetPolicyProviderName();
+ std::string name = extension ? extension->name() : "test";
+ DLOG(WARNING) << "Installation of extension " << name
+ << "( " << id << ")"
+ << " prohibited by " << (*it)->GetDebugPolicyProviderName();
return false;
}
}
@@ -56,8 +58,10 @@
if (!(*it)->UserMayModifySettings(extension, error)) {
// The extension may be NULL in testing.
std::string id = extension ? extension->id() : "[test]";
- DLOG(WARNING) << "Modification of extension " << id
- << " prohibited by " << (*it)->GetPolicyProviderName();
+ std::string name = extension ? extension->name() : "test";
+ DLOG(WARNING) << "Modification of extension " << name
+ << "( " << id << ")"
+ << " prohibited by " << (*it)->GetDebugPolicyProviderName();
return false;
}
}
@@ -68,12 +72,14 @@
string16* error) const {
for (ProviderList::const_iterator it = providers_.begin();
it != providers_.end(); ++it) {
+ if ((*it)->MustRemainEnabled(extension, error)) {
// The extension may be NULL in testing.
std::string id = extension ? extension->id() : "[test]";
- if ((*it)->MustRemainEnabled(extension, error)) {
- DLOG(WARNING) << "Extension " << id
+ std::string name = extension ? extension->name() : "test";
+ DLOG(WARNING) << "Extension " << name
+ << "( " << id << ")"
<< " required to remain enabled by "
- << (*it)->GetPolicyProviderName();
+ << (*it)->GetDebugPolicyProviderName();
return true;
}
}
« no previous file with comments | « chrome/browser/extensions/management_policy.h ('k') | chrome/browser/extensions/test_management_policy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698