| Index: chrome/browser/extensions/extension_prefs.h
|
| diff --git a/chrome/browser/extensions/extension_prefs.h b/chrome/browser/extensions/extension_prefs.h
|
| index 120ecf1394e949caf72376c5a9a67fa4db86709d..490b07d9375c570d84f056be1e7989d0a38aaa31 100644
|
| --- a/chrome/browser/extensions/extension_prefs.h
|
| +++ b/chrome/browser/extensions/extension_prefs.h
|
| @@ -152,11 +152,12 @@ class ExtensionPrefs : public ContentSettingsStore::Observer,
|
| bool did_escalate);
|
|
|
| // Getter and setters for disabled reason.
|
| - Extension::DisableReason GetDisableReason(
|
| - const std::string& extension_id);
|
| - void SetDisableReason(const std::string& extension_id,
|
| + int GetDisableReasons(const std::string& extension_id);
|
| + void AddDisableReason(const std::string& extension_id,
|
| Extension::DisableReason disable_reason);
|
| - void RemoveDisableReason(const std::string& extension_id);
|
| + void RemoveDisableReason(const std::string& extension_id,
|
| + Extension::DisableReason disable_reason);
|
| + void ClearDisableReasons(const std::string& extension_id);
|
|
|
| // Returns the version string for the currently installed extension, or
|
| // the empty string if not found.
|
| @@ -554,6 +555,9 @@ class ExtensionPrefs : public ContentSettingsStore::Observer,
|
| // Migrates the permissions data in the pref store.
|
| void MigratePermissions(const ExtensionIdSet& extension_ids);
|
|
|
| + // Migrates the disable reasons from a single enum to a bit mask.
|
| + void MigrateDisableReasons(const ExtensionIdSet& extension_ids);
|
| +
|
| // Checks whether there is a state pref for the extension and if so, whether
|
| // it matches |check_state|.
|
| bool DoesExtensionHaveState(const std::string& id,
|
|
|