Disallow packing or loading unpacked manifest v1 extensions.

chrome/common/extensions/extension.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/extension.h"
 
 #include <ostream>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 55 matching lines @@
 namespace switch_utils = extensions::switch_utils;
 
 using extensions::csp_validator::ContentSecurityPolicyIsLegal;
 using extensions::csp_validator::ContentSecurityPolicyIsSandboxed;
 using extensions::csp_validator::ContentSecurityPolicyIsSecure;
 
 namespace extensions {
 
 namespace {
 
-const int kModernManifestVersion = 1;
+const int kModernManifestVersion = 2;
 const int kPEMOutputColumns = 65;
 
 const char kOverrideExtentUrlPatternFormat[] = "chrome://%s/*";
 
 // The maximum number of commands (including page action/browser actions) an
 // extension can have.
 const size_t kMaxCommandsPerExtension = 4;
 
 // KEY MARKERS
 const char kKeyBeginHeaderMarker[] = "-----BEGIN";
@@ skipping 1264 matching lines @@
       *error = ASCIIToUTF16(errors::kInvalidManifestVersion);
       return false;
     }
   }
 
   manifest_version_ = manifest_->GetManifestVersion();
   if (creation_flags_ & REQUIRE_MODERN_MANIFEST_VERSION &&
       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 format string parameter, instead of
hardcoding it in the message.

[Aaron Boodman, 2012/08/31 21:03:17]

Done.

+    return false;
   }
 
   return true;
 }
 
 bool Extension::LoadHomepageURL(string16* error) {
   if (!manifest_->HasKey(keys::kHomepageURL))
     return true;
   std::string tmp;
   if (!manifest_->GetString(keys::kHomepageURL, &tmp)) {
@@ skipping 2565 matching lines @@
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const PermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}
 
 }   // namespace extensions