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

Unified Diff: chrome/browser/extensions/component_loader.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/component_loader.cc
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index dbe212b833e678de26121a4acca5b9c7d2caad43..5749f13cd53d7361f8eb41757674bb8eddb7ae8d 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -24,6 +24,7 @@
#include "components/user_prefs/pref_registry_syncable.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_source.h"
+#include "extensions/common/id_util.h"
#include "grit/browser_resources.h"
#include "ui/base/resource/resource_bundle.h"
@@ -50,10 +51,9 @@ std::string GenerateId(const DictionaryValue* manifest,
const base::FilePath& path) {
std::string raw_key;
std::string id_input;
- std::string id;
CHECK(manifest->GetString(extension_manifest_keys::kPublicKey, &raw_key));
CHECK(Extension::ParsePEMKeyBytes(raw_key, &id_input));
- CHECK(Extension::GenerateId(id_input, &id));
+ std::string id = id_util::GenerateId(id_input);
return id;
}
« no previous file with comments | « chrome/browser/extensions/api/tabs/tabs_api.cc ('k') | chrome/browser/extensions/component_loader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698