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

Side by Side Diff: chrome/browser/extensions/extension_creator.cc

Issue 481433005: Extensions: Move id_util functions to crx_file component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert last patchset. function returns Extension* and can't use an assert. Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/extension_creator.h" 5 #include "chrome/browser/extensions/extension_creator.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/file_util.h" 12 #include "base/file_util.h"
13 #include "base/files/scoped_file.h" 13 #include "base/files/scoped_file.h"
14 #include "base/files/scoped_temp_dir.h" 14 #include "base/files/scoped_temp_dir.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "chrome/browser/extensions/extension_creator_filter.h" 16 #include "chrome/browser/extensions/extension_creator_filter.h"
17 #include "components/crx_file/crx_file.h" 17 #include "components/crx_file/crx_file.h"
18 #include "components/crx_file/id_util.h"
18 #include "crypto/rsa_private_key.h" 19 #include "crypto/rsa_private_key.h"
19 #include "crypto/signature_creator.h" 20 #include "crypto/signature_creator.h"
20 #include "extensions/common/extension.h" 21 #include "extensions/common/extension.h"
21 #include "extensions/common/file_util.h" 22 #include "extensions/common/file_util.h"
22 #include "extensions/common/id_util.h"
23 #include "grit/generated_resources.h" 23 #include "grit/generated_resources.h"
24 #include "third_party/zlib/google/zip.h" 24 #include "third_party/zlib/google/zip.h"
25 #include "ui/base/l10n/l10n_util.h" 25 #include "ui/base/l10n/l10n_util.h"
26 26
27 namespace { 27 namespace {
28 const int kRSAKeySize = 2048; 28 const int kRSAKeySize = 2048;
29 }; 29 };
30 30
31 namespace extensions { 31 namespace extensions {
32 32
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 if (!key_pair->ExportPublicKey(&public_key_bytes)) { 92 if (!key_pair->ExportPublicKey(&public_key_bytes)) {
93 error_message_ = 93 error_message_ =
94 l10n_util::GetStringUTF8(IDS_EXTENSION_PUBLIC_KEY_FAILED_TO_EXPORT); 94 l10n_util::GetStringUTF8(IDS_EXTENSION_PUBLIC_KEY_FAILED_TO_EXPORT);
95 return false; 95 return false;
96 } 96 }
97 97
98 std::string public_key; 98 std::string public_key;
99 public_key.insert(public_key.begin(), 99 public_key.insert(public_key.begin(),
100 public_key_bytes.begin(), public_key_bytes.end()); 100 public_key_bytes.begin(), public_key_bytes.end());
101 101
102 std::string extension_id = id_util::GenerateId(public_key); 102 std::string extension_id = crx_file::id_util::GenerateId(public_key);
103 103
104 // Load the extension once. We don't really need it, but this does a lot of 104 // Load the extension once. We don't really need it, but this does a lot of
105 // useful validation of the structure. 105 // useful validation of the structure.
106 int create_flags = 106 int create_flags =
107 Extension::FOLLOW_SYMLINKS_ANYWHERE | Extension::ERROR_ON_PRIVATE_KEY; 107 Extension::FOLLOW_SYMLINKS_ANYWHERE | Extension::ERROR_ON_PRIVATE_KEY;
108 if (run_flags & kRequireModernManifestVersion) 108 if (run_flags & kRequireModernManifestVersion)
109 create_flags |= Extension::REQUIRE_MODERN_MANIFEST_VERSION; 109 create_flags |= Extension::REQUIRE_MODERN_MANIFEST_VERSION;
110 110
111 scoped_refptr<Extension> extension( 111 scoped_refptr<Extension> extension(
112 file_util::LoadExtension(extension_dir, 112 file_util::LoadExtension(extension_dir,
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 SignZip(zip_path, key_pair.get(), &signature) && 322 SignZip(zip_path, key_pair.get(), &signature) &&
323 WriteCRX(zip_path, key_pair.get(), signature, crx_path)) { 323 WriteCRX(zip_path, key_pair.get(), signature, crx_path)) {
324 result = true; 324 result = true;
325 } 325 }
326 326
327 base::DeleteFile(zip_path, false); 327 base::DeleteFile(zip_path, false);
328 return result; 328 return result;
329 } 329 }
330 330
331 } // namespace extensions 331 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698