Chromium Code Reviews| Index: chrome/common/extensions/extension.cc |
| diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc |
| index 24916813fd73b5dca9f529017f34a0d27c1da2fa..028912815ae283b0faa2dc68922d0eda8fdb0d7d 100644 |
| --- a/chrome/common/extensions/extension.cc |
| +++ b/chrome/common/extensions/extension.cc |
| @@ -73,7 +73,7 @@ namespace extensions { |
| namespace { |
| -const int kModernManifestVersion = 1; |
| +const int kModernManifestVersion = 2; |
| const int kPEMOutputColumns = 65; |
| const char kOverrideExtentUrlPatternFormat[] = "chrome://%s/*"; |
| @@ -1358,18 +1358,8 @@ bool Extension::LoadManifestVersion(string16* error) { |
| manifest_version_ < kModernManifestVersion && |
| !CommandLine::ForCurrentProcess()->HasSwitch( |
| switches::kAllowLegacyExtensionManifests)) { |
| - *error = ASCIIToUTF16(errors::kInvalidManifestVersion); |
| - return false; |
| - } |
| - |
| - if (location() == LOAD && manifest_version_ == 1) { |
| - install_warnings_.push_back(Extension::InstallWarning( |
| - Extension::InstallWarning::FORMAT_HTML, |
| - l10n_util::GetStringFUTF8( |
| - IDS_EXTENSION_MANIFEST_VERSION_OLD, |
| - ASCIIToUTF16("<a href='http://code.google.com/chrome/extensions/" |
| - "manifestVersion.html' target='_blank'>"), |
| - ASCIIToUTF16("</a>")))); |
| + *error = ASCIIToUTF16(errors::kInvalidManifestVersionOld); |
|
Mihai Parparita -not on Chrome
2012/08/31 20:50:16
You could make kModernManifestVersion into a forma
Aaron Boodman
2012/08/31 21:03:17
Done.
|
| + return false; |
| } |
| return true; |