summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-24 21:14:53 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-24 21:14:53 +0000
commit47e870bf26f0c01dafe611ec03c0139c735063df (patch)
tree43b29b36654d896cf3fd1bd3cc27b830c63522b0 /apps
parent883844f40f19b80880e0730a8e2836e6383d1400 (diff)
downloadchromium_src-47e870bf26f0c01dafe611ec03c0139c735063df.zip
chromium_src-47e870bf26f0c01dafe611ec03c0139c735063df.tar.gz
chromium_src-47e870bf26f0c01dafe611ec03c0139c735063df.tar.bz2
Revert 184352
> Add utf_string_conversions to base namespace. > > This adds "using"s for all functions so those can be fixed in a separate pass. > > This converts the "Wide" versions of the functions in the Chrome directory as a first pass on the changeover. > > BUG= > > Review URL: https://codereview.chromium.org/12314090 TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/12315071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184355 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
-rw-r--r--apps/app_host/update.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_host/update.cc b/apps/app_host/update.cc
index 88f31a5..e8b14be8 100644
--- a/apps/app_host/update.cc
+++ b/apps/app_host/update.cc
@@ -42,7 +42,7 @@ const wchar_t kBrowserAppGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}";
Version GetAppHostVersion() {
scoped_ptr<FileVersionInfo> version_info(
FileVersionInfo::CreateFileVersionInfoForCurrentModule());
- Version app_host_version(base::WideToASCII(version_info->product_version()));
+ Version app_host_version(WideToASCII(version_info->product_version()));
DCHECK(app_host_version.IsValid());
return app_host_version;
}
@@ -58,7 +58,7 @@ Version GetAppVersionFromRegistry(const wchar_t* app_guid) {
if ((reg_key.Open(root_key, client_key.c_str(),
KEY_QUERY_VALUE) == ERROR_SUCCESS) &&
(reg_key.ReadValue(kRegVersionField, &version_str) == ERROR_SUCCESS)) {
- return Version(base::WideToASCII(version_str));
+ return Version(WideToASCII(version_str));
}
return Version();
}