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

Unified Diff: chrome/installer/util/installer_state.cc

Issue 12314090: Add utf_string_conversions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months 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/installer/util/installation_state.cc ('k') | chrome/installer/util/installer_state_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/installer_state.cc
diff --git a/chrome/installer/util/installer_state.cc b/chrome/installer/util/installer_state.cc
index 66ffb247750241d19641d8b4cdf40e2ea78bd3cc..87e14d806cd50324a8ead68cf071de4ed65d2d55 100644
--- a/chrome/installer/util/installer_state.cc
+++ b/chrome/installer/util/installer_state.cc
@@ -599,7 +599,7 @@ bool InstallerState::IsChromeFrameRunning(
base::FilePath InstallerState::GetInstallerDirectory(
const Version& version) const {
- return target_path().Append(ASCIIToWide(version.GetString()))
+ return target_path().Append(base::ASCIIToWide(version.GetString()))
.Append(kInstallerDir);
}
@@ -628,7 +628,7 @@ void InstallerState::GetExistingExeVersions(
if (file_version_info) {
string16 version_string = file_version_info->file_version();
if (!version_string.empty() && IsStringASCII(version_string))
- existing_versions->insert(WideToASCII(version_string));
+ existing_versions->insert(base::WideToASCII(version_string));
}
}
}
@@ -656,7 +656,7 @@ void InstallerState::RemoveOldVersionDirectories(
for (base::FilePath next_version = version_enum.Next(); !next_version.empty();
next_version = version_enum.Next()) {
base::FilePath dir_name(next_version.BaseName());
- version = Version(WideToASCII(dir_name.value()));
+ version = Version(base::WideToASCII(dir_name.value()));
// Delete the version folder if it is less than the new version and not
// equal to the old version (if we have an old version).
if (version.IsValid() &&
« no previous file with comments | « chrome/installer/util/installation_state.cc ('k') | chrome/installer/util/installer_state_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698