Index: chrome/browser/extensions/extension_service.h |
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h |
index 556adb0025afdec9c42b162005a9cf4879179df8..0f54b6124bae87c0d84fac97d087244381c69fb2 100644 |
--- a/chrome/browser/extensions/extension_service.h |
+++ b/chrome/browser/extensions/extension_service.h |
@@ -548,8 +548,11 @@ class ExtensionService |
void UpdateActiveExtensionsInCrashReporter(); |
// Helper to determine whether we should initially enable an installed |
- // (or upgraded) extension. |
- bool ShouldEnableOnInstall(const extensions::Extension* extension); |
+ // (or upgraded) extension. |disable_reason| will be ignored if NULL, |
not at google - send to devlin
2014/11/12 18:02:15
This comment is misleading, it should mention that
binjin
2014/11/12 18:39:01
Done(editing the comments). Also this pointer is n
not at google - send to devlin
2014/11/12 19:35:17
It looks to me to be precisely the reason that thi
binjin
2014/11/13 12:03:31
I'm sorry, I think I didn't get your point. Do you
not at google - send to devlin
2014/11/13 17:41:21
No I mean that you should change the return type o
|
+ // otherwise contains why |extension| should not be enabled. |
+ bool ShouldEnableOnInstall( |
+ const extensions::Extension* extension, |
+ extensions::Extension::DisableReason* disable_reason); |
// Helper to determine if updating an extensions should proceed immediately, |
// or if we should delay the update until further notice. |
@@ -735,6 +738,8 @@ class ExtensionService |
GreylistDontEnableManuallyDisabled); |
FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest, |
GreylistUnknownDontChange); |
+ FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest, |
+ ManagementPolicyProhibitsEnableOnInstalled); |
DISALLOW_COPY_AND_ASSIGN(ExtensionService); |
}; |