diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 21:11:46 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 21:11:46 +0000 |
| commit | 74f778ee567a5e18ae6766416711b92fc6e7f39a (patch) | |
| tree | c2da3cc66ebb5285d8ff3f210ebdb446eb61837f /device | |
| parent | a80aea7ebc002065d8f24c54673c72cb61d47b07 (diff) | |
| download | chromium_src-74f778ee567a5e18ae6766416711b92fc6e7f39a.zip chromium_src-74f778ee567a5e18ae6766416711b92fc6e7f39a.tar.gz chromium_src-74f778ee567a5e18ae6766416711b92fc6e7f39a.tar.bz2 | |
Move UTF16ToASCII, remove WideToASCII.
This removes WideToASCII and changes all callers to use UTF16ToASCII instead.
Moves UTF16ToASCII from base/strings/string_util.h to base/strings/utf_string_conversions.h and into the base namespace.
Convert a few related string_util functions to take a StringPiece16 instead of a string16. Remove IsStringASCII(std::wstring) which was unused.
Updates callers' includes and namespace usage accordingly.
TBR=sky
Review URL: https://codereview.chromium.org/176843022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device')
| -rw-r--r-- | device/serial/serial_device_enumerator_win.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/device/serial/serial_device_enumerator_win.cc b/device/serial/serial_device_enumerator_win.cc index e3bde29..a45a609 100644 --- a/device/serial/serial_device_enumerator_win.cc +++ b/device/serial/serial_device_enumerator_win.cc @@ -10,6 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/registry.h" namespace device { @@ -34,7 +35,7 @@ void SerialDeviceEnumeratorWin::GetDevices(SerialDeviceInfoList* devices) { for (; iter_key.Valid(); ++iter_key) { base::string16 value(iter_key.Value()); linked_ptr<SerialDeviceInfo> info(new SerialDeviceInfo); - info->path = WideToASCII(value); + info->path = base::UTF16ToASCII(value); devices->push_back(info); } } |