diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-23 21:25:16 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-23 21:25:16 +0000 |
| commit | 993da5e316353bf36dc27df8e01e91b36ad3cab1 (patch) | |
| tree | 1962a24c54d212e1d459eb3f58c8f2e478cc2e6c /chrome/browser/extensions/extension_creator.cc | |
| parent | 5799a694a40b1c443788df56aa749d1c059577fd (diff) | |
| download | chromium_src-993da5e316353bf36dc27df8e01e91b36ad3cab1.zip chromium_src-993da5e316353bf36dc27df8e01e91b36ad3cab1.tar.gz chromium_src-993da5e316353bf36dc27df8e01e91b36ad3cab1.tar.bz2 | |
Move CrxFile, FileReader, ExtensionResource to src/extensions.
Also move ExtensionResource to extensions namespace.
Also clean up the GenerateId and ShouldLocalizeManfest interfaces.
BUG=159265
Review URL: https://chromiumcodereview.appspot.com/12578008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190078 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_creator.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_creator.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc index c4bc70d..8842e0d 100644 --- a/chrome/browser/extensions/extension_creator.cc +++ b/chrome/browser/extensions/extension_creator.cc @@ -13,13 +13,14 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_handle.h" #include "base/string_util.h" -#include "chrome/browser/extensions/crx_file.h" #include "chrome/browser/extensions/extension_creator_filter.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/zip.h" #include "crypto/rsa_private_key.h" #include "crypto/signature_creator.h" +#include "extensions/common/crx_file.h" +#include "extensions/common/id_util.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -97,9 +98,7 @@ bool ExtensionCreator::ValidateManifest(const base::FilePath& extension_dir, public_key.insert(public_key.begin(), public_key_bytes.begin(), public_key_bytes.end()); - std::string extension_id; - if (!Extension::GenerateId(public_key, &extension_id)) - return false; + std::string extension_id = id_util::GenerateId(public_key); // Load the extension once. We don't really need it, but this does a lot of // useful validation of the structure. |