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

Unified Diff: chrome/browser/extensions/external_registry_extension_provider_win.cc

Issue 5848005: base/version: remove wstring version (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: retry Created 10 years 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
« no previous file with comments | « chrome/browser/enumerate_modules_model_win.cc ('k') | chrome/browser/gpu_blacklist.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/external_registry_extension_provider_win.cc
diff --git a/chrome/browser/extensions/external_registry_extension_provider_win.cc b/chrome/browser/extensions/external_registry_extension_provider_win.cc
index daf3d99cbcfefc484744cd0fa2dbbc059c5ef257..16b107ff9fdd3b040688442ac4eed3065f5dae12 100644
--- a/chrome/browser/extensions/external_registry_extension_provider_win.cc
+++ b/chrome/browser/extensions/external_registry_extension_provider_win.cc
@@ -58,7 +58,8 @@ void ExternalRegistryExtensionProvider::VisitRegisteredExtension(
StringToLowerASCII(&id);
scoped_ptr<Version> version;
- version.reset(Version::GetVersionFromString(extension_version));
+ version.reset(Version::GetVersionFromString(
+ WideToASCII(extension_version)));
if (!version.get()) {
LOG(ERROR) << "Invalid version value " << extension_version
<< " for key " << key_path;
@@ -103,8 +104,10 @@ bool ExternalRegistryExtensionProvider::GetExtensionDetails(
if (!key.ReadValue(kRegistryExtensionVersion, &extension_version))
return false;
- if (version)
- version->reset(Version::GetVersionFromString(extension_version));
+ if (version) {
+ version->reset(Version::GetVersionFromString(
+ WideToASCII(extension_version)));
+ }
if (location)
*location = Extension::EXTERNAL_REGISTRY;
« no previous file with comments | « chrome/browser/enumerate_modules_model_win.cc ('k') | chrome/browser/gpu_blacklist.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698