| 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..fcb00250d67ccfb7ba3613a12a004c2b91eb70b4 100644
|
| --- a/chrome/browser/extensions/extension_service.h
|
| +++ b/chrome/browser/extensions/extension_service.h
|
| @@ -547,9 +547,11 @@ class ExtensionService
|
| // Helper that updates the active extension list used for crash reporting.
|
| void UpdateActiveExtensionsInCrashReporter();
|
|
|
| - // Helper to determine whether we should initially enable an installed
|
| - // (or upgraded) extension.
|
| - bool ShouldEnableOnInstall(const extensions::Extension* extension);
|
| + // Helper to get the disable reason for an installed (or upgraded) extension.
|
| + // A return value of Extension::DISABLE_NONE indicates that we should enable
|
| + // this extension initially.
|
| + extensions::Extension::DisableReason GetDisableReasonOnInstalled(
|
| + const extensions::Extension* extension);
|
|
|
| // Helper to determine if updating an extensions should proceed immediately,
|
| // or if we should delay the update until further notice.
|
| @@ -735,6 +737,8 @@ class ExtensionService
|
| GreylistDontEnableManuallyDisabled);
|
| FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
|
| GreylistUnknownDontChange);
|
| + FRIEND_TEST_ALL_PREFIXES(ExtensionServiceTest,
|
| + ManagementPolicyProhibitsEnableOnInstalled);
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ExtensionService);
|
| };
|
|
|