Chromium Code Reviews| Index: extensions/browser/extension_prefs.h |
| diff --git a/extensions/browser/extension_prefs.h b/extensions/browser/extension_prefs.h |
| index cdfb278d35963e8b7b0de81dfbc8b20eb1e93d4a..b14e1f448b261456fab49cdc50e1087d689c75d9 100644 |
| --- a/extensions/browser/extension_prefs.h |
| +++ b/extensions/browser/extension_prefs.h |
| @@ -178,19 +178,24 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService { |
| // Called when an extension is installed, so that prefs get created. |
| // If |page_ordinal| is invalid then a page will be found for the App. |
| + // |initial_disable_reason| is the disable reason if |initial_state| is set |
| + // to disable the extension initially, if applicable. |
| // |install_flags| are a bitmask of extension::InstallFlags. |
| void OnExtensionInstalled(const Extension* extension, |
| Extension::State initial_state, |
| + Extension::DisableReason initial_disable_reason, |
| const syncer::StringOrdinal& page_ordinal, |
| int install_flags, |
| const std::string& install_parameter); |
| // OnExtensionInstalled with no install flags. |
| void OnExtensionInstalled(const Extension* extension, |
| Extension::State initial_state, |
| + Extension::DisableReason initial_disable_reason, |
| const syncer::StringOrdinal& page_ordinal, |
| const std::string& install_parameter) { |
| OnExtensionInstalled(extension, |
| initial_state, |
| + initial_disable_reason, |
| page_ordinal, |
| kInstallFlagNone, |
| install_parameter); |
| @@ -416,9 +421,13 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService { |
| // We've downloaded an updated .crx file for the extension, but are waiting |
| // to install it. |
| // |
| + // |initial_disable_reason| is the disable reason if |initial_state| is set |
| + // set |
| + // to disable the extension initially, if applicable. |
|
Finnur
2014/11/11 22:58:03
This is also confusing to read. Can you revise?
|
| // |install_flags| are a bitmask of extension::InstallFlags. |
| void SetDelayedInstallInfo(const Extension* extension, |
| Extension::State initial_state, |
| + Extension::DisableReason initial_disable_reason, |
| int install_flags, |
| DelayReason delay_reason, |
| const syncer::StringOrdinal& page_ordinal, |
| @@ -643,12 +652,14 @@ class ExtensionPrefs : public ExtensionScopedPrefs, public KeyedService { |
| // installations. |
| // |
| // |install_flags| are a bitmask of extension::InstallFlags. |
| - void PopulateExtensionInfoPrefs(const Extension* extension, |
| - const base::Time install_time, |
| - Extension::State initial_state, |
| - int install_flags, |
| - const std::string& install_parameter, |
| - base::DictionaryValue* extension_dict); |
| + void PopulateExtensionInfoPrefs( |
| + const Extension* extension, |
| + const base::Time install_time, |
| + Extension::State initial_state, |
| + Extension::DisableReason initial_disable_reason, |
| + int install_flags, |
| + const std::string& install_parameter, |
| + base::DictionaryValue* extension_dict); |
| void InitExtensionControlledPrefs(ExtensionPrefValueMap* value_map); |