summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gpu_blacklist.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-17 00:09:50 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-17 00:09:50 +0000
commitbf94d1a4cee4be0648778022f27100f8a074e34a (patch)
treebc9c5a831207e06e5cbd179eafc9ffa2ea791589 /chrome/browser/gpu_blacklist.cc
parente31134ff5c4b5889af71cc58b294d1935fd48322 (diff)
downloadchromium_src-bf94d1a4cee4be0648778022f27100f8a074e34a.zip
chromium_src-bf94d1a4cee4be0648778022f27100f8a074e34a.tar.gz
chromium_src-bf94d1a4cee4be0648778022f27100f8a074e34a.tar.bz2
base/version: remove wstring version
And fix callers. BUG=23581 TEST=trybots Review URL: http://codereview.chromium.org/5848005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69490 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gpu_blacklist.cc')
-rw-r--r--chrome/browser/gpu_blacklist.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/gpu_blacklist.cc b/chrome/browser/gpu_blacklist.cc
index fe246d6..85063a8 100644
--- a/chrome/browser/gpu_blacklist.cc
+++ b/chrome/browser/gpu_blacklist.cc
@@ -7,6 +7,7 @@
#include "base/json/json_reader.h"
#include "base/logging.h"
#include "base/string_number_conversions.h"
+#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/sys_info.h"
#include "base/values.h"
@@ -369,7 +370,7 @@ GpuFeatureFlags GpuBlacklist::DetermineGpuFeatureFlags(
if (gpu_info.progress() == GPUInfo::kUninitialized)
return flags;
scoped_ptr<Version> driver_version(
- Version::GetVersionFromString(gpu_info.driver_version()));
+ Version::GetVersionFromString(WideToASCII(gpu_info.driver_version())));
if (driver_version.get() == NULL)
return flags;