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 /cloud_print | |
| 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 'cloud_print')
| -rw-r--r-- | cloud_print/virtual_driver/win/install/setup.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc index 07aefbc..fe764a10 100644 --- a/cloud_print/virtual_driver/win/install/setup.cc +++ b/cloud_print/virtual_driver/win/install/setup.cc @@ -283,7 +283,7 @@ HRESULT InstallDriver(const base::FilePath& install_path) { driver_info.pDriverPath = const_cast<LPWSTR>(xps_path.value().c_str()); driver_info.pConfigFile = const_cast<LPWSTR>(ui_path.value().c_str()); - base::string16 dependent_files(JoinString(dependent_array, L'\n')); + base::string16 dependent_files(base::JoinString(dependent_array, L"\n")); dependent_files.push_back(L'\n'); std::replace(dependent_files.begin(), dependent_files.end(), L'\n', L'\0'); driver_info.pDependentFiles = &dependent_files[0]; |