Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2958)

Unified Diff: chrome/browser/extensions/extension_creator.cc

Issue 12578008: Move CrxFile, FileReader, ExtensionResource to src/extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_creator.cc
diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc
index c4bc70dd674f19d39def0f7c583152098fa3ee68..8842e0d8d33f8763d099a05dede903c0c99ed400 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.
« no previous file with comments | « chrome/browser/extensions/extension_browsertest.cc ('k') | chrome/browser/extensions/extension_function_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698