summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extensions_service.cc
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 22:59:43 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-03 22:59:43 +0000
commit8e50b600ed1e65789109022709cf5c349748fb4c (patch)
treed9d57344003604647e1a96a56ef4d21921ec44c0 /chrome/browser/extensions/extensions_service.cc
parent0c8a8f7aa683ae7d6c8ba176c1db704cc294defb (diff)
downloadchromium_src-8e50b600ed1e65789109022709cf5c349748fb4c.zip
chromium_src-8e50b600ed1e65789109022709cf5c349748fb4c.tar.gz
chromium_src-8e50b600ed1e65789109022709cf5c349748fb4c.tar.bz2
revert broken change 10833
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extensions_service.cc')
-rw-r--r--chrome/browser/extensions/extensions_service.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index be6f068..3271920 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -402,15 +402,14 @@ DictionaryValue* ExtensionsServiceBackend::ReadManifest() {
// again later, checking it here allows us to skip some potentially expensive
// work.
std::string id;
- if (!manifest->GetString(WideToUTF16Hack(Extension::kIdKey), &id)) {
+ if (!manifest->GetString(Extension::kIdKey, &id)) {
ReportExtensionInstallError("missing id key");
return NULL;
}
FilePath dest_dir = install_directory_.AppendASCII(id.c_str());
if (file_util::PathExists(dest_dir)) {
std::string version;
- if (!manifest->GetString(WideToUTF16Hack(Extension::kVersionKey),
- &version)) {
+ if (!manifest->GetString(Extension::kVersionKey, &version)) {
ReportExtensionInstallError("missing version key");
return NULL;
}
@@ -422,8 +421,7 @@ DictionaryValue* ExtensionsServiceBackend::ReadManifest() {
}
std::string zip_hash;
- if (!manifest->GetString(WideToUTF16Hack(Extension::kZipHashKey),
- &zip_hash)) {
+ if (!manifest->GetString(Extension::kZipHashKey, &zip_hash)) {
ReportExtensionInstallError("missing zip_hash key");
return NULL;
}