chrome/browser/extensions/extension_creator.cc - Issue 481433005: Extensions: Move id_util functions to crx_file component.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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:

Index: chrome/browser/extensions/extension_creator.cc

diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc

index f6cc4bd6ca9158cd818abe06105c8c01c9ebd054..631dd5347e55ea8099788383629fce7dbee4d380 100644

--- a/chrome/browser/extensions/extension_creator.cc

+++ b/chrome/browser/extensions/extension_creator.cc

@@ -15,11 +15,11 @@

#include "base/strings/string_util.h"

#include "chrome/browser/extensions/extension_creator_filter.h"

#include "components/crx_file/crx_file.h"

+#include "components/crx_file/id_util.h"

#include "crypto/rsa_private_key.h"

#include "crypto/signature_creator.h"

#include "extensions/common/extension.h"

#include "extensions/common/file_util.h"

-#include "extensions/common/id_util.h"

#include "grit/generated_resources.h"

#include "third_party/zlib/google/zip.h"

#include "ui/base/l10n/l10n_util.h"

@@ -99,7 +99,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 = id_util::GenerateId(public_key);

+ std::string extension_id = crx_file::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.