chrome/browser/extensions/component_loader.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/component_loader.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/component_loader.cc

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

index ac35c2b62d748ef3b469c06fb83d09a37582a42c..6af2018daed17d805145bff00027f6dfbee95b37 100644

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

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

@@ -17,12 +17,12 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

#include "chrome/common/extensions/extension_constants.h"

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

#include "content/public/browser/browser_context.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/plugin_service.h"

#include "extensions/common/extension.h"

#include "extensions/common/file_util.h"

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

#include "extensions/common/manifest_constants.h"

#include "grit/browser_resources.h"

#include "grit/generated_resources.h"

@@ -66,7 +66,7 @@ std::string GenerateId(const base::DictionaryValue* manifest,

std::string id_input;

CHECK(manifest->GetString(manifest_keys::kPublicKey, &raw_key));

CHECK(Extension::ParsePEMKeyBytes(raw_key, &id_input));

- std::string id = id_util::GenerateId(id_input);

+ std::string id = crx_file::id_util::GenerateId(id_input);

return id;

}