summaryrefslogtreecommitdiffstats
path: root/chrome/installer/setup
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-24 20:27:04 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-24 20:27:04 +0000
commit5f0cebb46d66ef0a1996594d0846c0067a8cf475 (patch)
tree5b3204961a403e7396fe48b45930b5b6528839f0 /chrome/installer/setup
parent20023a76c3ffa049c35f86263fbf6ee4bbf00ade (diff)
downloadchromium_src-5f0cebb46d66ef0a1996594d0846c0067a8cf475.zip
chromium_src-5f0cebb46d66ef0a1996594d0846c0067a8cf475.tar.gz
chromium_src-5f0cebb46d66ef0a1996594d0846c0067a8cf475.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup')
-rw-r--r--chrome/installer/setup/chrome_frame_ready_mode.cc3
-rw-r--r--chrome/installer/setup/install_worker.cc28
-rw-r--r--chrome/installer/setup/setup_util.cc2
-rw-r--r--chrome/installer/setup/uninstall.cc2
4 files changed, 19 insertions, 16 deletions
diff --git a/chrome/installer/setup/chrome_frame_ready_mode.cc b/chrome/installer/setup/chrome_frame_ready_mode.cc
index c8a98c4..62bcb64 100644
--- a/chrome/installer/setup/chrome_frame_ready_mode.cc
+++ b/chrome/installer/setup/chrome_frame_ready_mode.cc
@@ -215,7 +215,8 @@ InstallStatus ChromeFrameReadyModeEndTempOptOut(
HKEY root = installer_state.root_key();
std::wstring chrome_frame_ua_value_name(kChromeFramePrefix);
- chrome_frame_ua_value_name += ASCIIToWide(installed_version.GetString());
+ chrome_frame_ua_value_name +=
+ base::ASCIIToWide(installed_version.GetString());
// Store the Chrome Frame user agent string
item_list->AddSetRegValueWorkItem(root, kPostPlatformUAKey,
diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc
index 5450e32..90297d2 100644
--- a/chrome/installer/setup/install_worker.cc
+++ b/chrome/installer/setup/install_worker.cc
@@ -245,7 +245,7 @@ void AddCommandWithParameterWorkItems(const InstallerState& installer_state,
if (installer_state.operation() == InstallerState::UNINSTALL) {
work_item_list->AddDeleteRegKeyWorkItem(
installer_state.root_key(), full_cmd_key)->set_log_message(
- "removing " + WideToASCII(command_key) + " command");
+ "removing " + base::WideToASCII(command_key) + " command");
} else {
CommandLine cmd_line(installer_state.target_path().Append(app));
cmd_line.AppendSwitchASCII(command_with_parameter, "%1");
@@ -750,14 +750,16 @@ void AddUninstallShortcutWorkItems(const InstallerState& installer_state,
L"Publisher",
browser_dist->GetPublisherName(),
true);
- install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg,
- L"Version",
- ASCIIToWide(new_version.GetString()),
- true);
- install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg,
- L"DisplayVersion",
- ASCIIToWide(new_version.GetString()),
- true);
+ install_list->AddSetRegValueWorkItem(
+ reg_root, uninstall_reg,
+ L"Version",
+ base::ASCIIToWide(new_version.GetString()),
+ true);
+ install_list->AddSetRegValueWorkItem(
+ reg_root, uninstall_reg,
+ L"DisplayVersion",
+ base::ASCIIToWide(new_version.GetString()),
+ true);
install_list->AddSetRegValueWorkItem(reg_root, uninstall_reg,
L"InstallDate",
InstallUtil::GetCurrentDate(),
@@ -806,7 +808,7 @@ void AddVersionKeyWorkItems(HKEY root,
}
list->AddSetRegValueWorkItem(root, version_key,
google_update::kRegVersionField,
- ASCIIToWide(new_version.GetString()),
+ base::ASCIIToWide(new_version.GetString()),
true); // overwrite version
}
@@ -1070,12 +1072,12 @@ bool AppendPostInstallTasks(const InstallerState& installer_state,
if (current_version) {
in_use_update_work_items->AddSetRegValueWorkItem(root, version_key,
google_update::kRegOldVersionField,
- ASCIIToWide(current_version->GetString()), true);
+ base::ASCIIToWide(current_version->GetString()), true);
}
if (critical_version.IsValid()) {
in_use_update_work_items->AddSetRegValueWorkItem(root, version_key,
google_update::kRegCriticalVersionField,
- ASCIIToWide(critical_version.GetString()), true);
+ base::ASCIIToWide(critical_version.GetString()), true);
} else {
in_use_update_work_items->AddDeleteRegValueWorkItem(root, version_key,
google_update::kRegCriticalVersionField);
@@ -1682,7 +1684,7 @@ void AddQuickEnableChromeFrameWorkItems(const InstallerState& installer_state,
// isn't installed since we don't want them left behind in any case.
work_item_list->AddDeleteRegKeyWorkItem(
installer_state.root_key(), cmd_key)->set_log_message(
- "removing " + WideToASCII(kCmdQuickEnableCf) + " command");
+ "removing " + base::WideToASCII(kCmdQuickEnableCf) + " command");
} else if (will_have_chrome_binaries) {
// Chrome Frame isn't (to be) installed while some other multi-install
diff --git a/chrome/installer/setup/setup_util.cc b/chrome/installer/setup/setup_util.cc
index 9f112c0..b60a39d 100644
--- a/chrome/installer/setup/setup_util.cc
+++ b/chrome/installer/setup/setup_util.cc
@@ -138,7 +138,7 @@ Version* GetMaxVersionFromArchiveDir(const base::FilePath& chrome_path) {
VLOG(1) << "directory found: " << find_data.cFileName;
scoped_ptr<Version> found_version(
- new Version(WideToASCII(find_data.cFileName)));
+ new Version(base::WideToASCII(find_data.cFileName)));
if (found_version->IsValid() &&
found_version->CompareTo(*max_version.get()) > 0) {
max_version.reset(found_version.release());
diff --git a/chrome/installer/setup/uninstall.cc b/chrome/installer/setup/uninstall.cc
index 2458eef..b74e906 100644
--- a/chrome/installer/setup/uninstall.cc
+++ b/chrome/installer/setup/uninstall.cc
@@ -191,7 +191,7 @@ void ClearRlzProductState() {
// If chrome has been reactivated, clear all events for this brand as well.
string16 reactivation_brand_wide;
if (GoogleUpdateSettings::GetReactivationBrand(&reactivation_brand_wide)) {
- std::string reactivation_brand(WideToASCII(reactivation_brand_wide));
+ std::string reactivation_brand(base::WideToASCII(reactivation_brand_wide));
rlz_lib::SupplementaryBranding branding(reactivation_brand.c_str());
rlz_lib::ClearProductState(rlz_lib::CHROME, points);
}
generated by cgit v1.1 at 2025-03-09 03:03:39 +0000