summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorsanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-17 00:28:03 +0000
committersanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-17 00:28:03 +0000
commit680d201ec4f79642cca4073145fdb86e809eb03c (patch)
tree2d90a0f932cffb68277d65152eedd7c6e5f35d4f /chrome_frame
parentbf94d1a4cee4be0648778022f27100f8a074e34a (diff)
downloadchromium_src-680d201ec4f79642cca4073145fdb86e809eb03c.zip
chromium_src-680d201ec4f79642cca4073145fdb86e809eb03c.tar.gz
chromium_src-680d201ec4f79642cca4073145fdb86e809eb03c.tar.bz2
Revert 69490 - base/version: remove wstring version
And fix callers. BUG=23581 TEST=trybots Review URL: http://codereview.chromium.org/5848005 TBR=evan@chromium.org Review URL: http://codereview.chromium.org/5905006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69491 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/dll_redirector.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome_frame/dll_redirector.cc b/chrome_frame/dll_redirector.cc
index 822e474..97143a7 100644
--- a/chrome_frame/dll_redirector.cc
+++ b/chrome_frame/dll_redirector.cc
@@ -14,7 +14,6 @@
#include "base/logging.h"
#include "base/path_service.h"
#include "base/shared_memory.h"
-#include "base/string_util.h"
#include "base/sys_info.h"
#include "base/utf_string_conversions.h"
#include "base/version.h"
@@ -248,7 +247,7 @@ Version* DllRedirector::GetCurrentModuleVersion() {
Version* current_version = NULL;
if (file_version_info.get()) {
current_version = Version::GetVersionFromString(
- WideToASCII(file_version_info->file_version()));
+ file_version_info->file_version());
DCHECK(current_version);
}