diff options
author | brettw <brettw@chromium.org> | 2015-07-14 22:19:26 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-15 05:20:15 +0000 |
commit | d94a2214777c98910f946b6a15258618215545f4 (patch) | |
tree | d5ae23a49e50d06b187e122578a7856a36adbc2b /chrome/installer/setup | |
parent | 65c576eee7276db9f003a553dd01970778d631ad (diff) | |
download | chromium_src-d94a2214777c98910f946b6a15258618215545f4.zip chromium_src-d94a2214777c98910f946b6a15258618215545f4.tar.gz chromium_src-d94a2214777c98910f946b6a15258618215545f4.tar.bz2 |
Move JoinString to the base namespace.
Change "Separator" from string to StringPIece (most are constants). Remove char versions for symmetry with SplitString.
Update callers who pass empty separators to use a base::StringPiece()
Change chromecast/base/metrics/cast_metrics_helper.cc to not use JoinString at all and just append to the output (code is simpler and faster).
TBR=zelidrag@chromium.org for chromeos
Committed: https://crrev.com/0eabfa001ba06d3c66992b95b69a988ef0633992
Cr-Commit-Position: refs/heads/master@{#338762}
patch from issue 1223153003 at patchset 160001 (http://crrev.com/1223153003#ps160001)
BUG=
Review URL: https://codereview.chromium.org/1230243005
Cr-Commit-Position: refs/heads/master@{#338819}
Diffstat (limited to 'chrome/installer/setup')
-rw-r--r-- | chrome/installer/setup/update_active_setup_version_work_item.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/installer/setup/update_active_setup_version_work_item.cc b/chrome/installer/setup/update_active_setup_version_work_item.cc index 4d35494..7372675 100644 --- a/chrome/installer/setup/update_active_setup_version_work_item.cc +++ b/chrome/installer/setup/update_active_setup_version_work_item.cc @@ -69,5 +69,5 @@ base::string16 UpdateActiveSetupVersionWorkItem::GetUpdatedActiveSetupVersion( version_components[OS_UPGRADES] = base::UintToString16(previous_value + 1); } - return JoinString(version_components, L','); + return base::JoinString(version_components, L","); } |