Chromium Code Reviews| Index: chrome/common/extensions/extension.cc |
| diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc |
| index 4ef186a58bf4c447068aa6f00017e923e2699dd8..760bc1173efe1829ff3a95596681e695d6087459 100644 |
| --- a/chrome/common/extensions/extension.cc |
| +++ b/chrome/common/extensions/extension.cc |
| @@ -1804,17 +1804,17 @@ bool Extension::LoadBackgroundPersistent( |
| string16* error) { |
| Value* background_persistent = NULL; |
|
Yoyo Zhou
2012/03/28 21:55:28
Might want to rename this too.
|
| if (!api_permissions.count(ExtensionAPIPermission::kExperimental) || |
| - !manifest_->Get(keys::kBackgroundPersistent, &background_persistent)) |
| + !manifest_->Get(keys::kBackgroundTransient, &background_persistent)) |
| return true; |
| if (!background_persistent->IsType(Value::TYPE_BOOLEAN) || |
| - !background_persistent->GetAsBoolean(&background_page_persists_)) { |
| - *error = ASCIIToUTF16(errors::kInvalidBackgroundPersistent); |
| + !background_persistent->GetAsBoolean(&background_page_is_transient_)) { |
| + *error = ASCIIToUTF16(errors::kInvalidBackgroundTransient); |
| return false; |
| } |
| if (!has_background_page()) { |
| - *error = ASCIIToUTF16(errors::kInvalidBackgroundPersistentNoPage); |
| + *error = ASCIIToUTF16(errors::kInvalidBackgroundTransientNoPage); |
| return false; |
| } |
| @@ -2732,7 +2732,7 @@ Extension::Extension(const FilePath& path, |
| incognito_split_mode_(false), |
| offline_enabled_(false), |
| converted_from_user_script_(false), |
| - background_page_persists_(true), |
| + background_page_is_transient_(false), |
| allow_background_js_access_(true), |
| manifest_(manifest.release()), |
| is_storage_isolated_(false), |