diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-08 14:30:41 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-12 13:49:54 +0200 |
commit | ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 (patch) | |
tree | 498dfb8a97ff3361a9f7486863a52bb4e26bb898 /chromium/content/public/common/webplugininfo.cc | |
parent | 4ce69f7403811819800e7c5ae1318b2647e778d1 (diff) |
Update Chromium to beta version 37.0.2062.68
Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/content/public/common/webplugininfo.cc')
-rw-r--r-- | chromium/content/public/common/webplugininfo.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/content/public/common/webplugininfo.cc b/chromium/content/public/common/webplugininfo.cc index 9f0c42f9ced..b6fedb9bd0f 100644 --- a/chromium/content/public/common/webplugininfo.cc +++ b/chromium/content/public/common/webplugininfo.cc @@ -21,7 +21,7 @@ WebPluginMimeType::WebPluginMimeType(const std::string& m, const std::string& d) : mime_type(m), file_extensions(), - description(ASCIIToUTF16(d)) { + description(base::ASCIIToUTF16(d)) { file_extensions.push_back(f); } @@ -73,7 +73,7 @@ void WebPluginInfo::CreateVersionFromString( base::Version* parsed_version) { // Remove spaces and ')' from the version string, // Replace any instances of 'r', ',' or '(' with a dot. - std::string version = UTF16ToASCII(version_string); + std::string version = base::UTF16ToASCII(version_string); base::RemoveChars(version, ") ", &version); std::replace(version.begin(), version.end(), 'd', '.'); std::replace(version.begin(), version.end(), 'r', '.'); |