diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 20:04:53 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-25 20:04:53 +0000 |
| commit | b6775d788c0bcc4bc879731478a2eadc522dc767 (patch) | |
| tree | cbe11af8995612881de1dc5d70cf958d4dc3e377 /chrome_frame | |
| parent | 6c3bf032651d5f912775e0c8cd7e962454145ced (diff) | |
| download | chromium_src-b6775d788c0bcc4bc879731478a2eadc522dc767.zip chromium_src-b6775d788c0bcc4bc879731478a2eadc522dc767.tar.gz chromium_src-b6775d788c0bcc4bc879731478a2eadc522dc767.tar.bz2 | |
Update some uses of char16 to use the base:: namespace.
BUG=329295
TEST=no change
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/113403006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/simple_resource_loader.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc index b6e21e6..22024f3 100644 --- a/chrome_frame/simple_resource_loader.cc +++ b/chrome_frame/simple_resource_loader.cc @@ -248,7 +248,7 @@ std::wstring SimpleResourceLoader::GetLocalizedResource(int message_id) { // Data pack encodes strings as either UTF8 or UTF16. base::string16 msg; if (data_pack_->GetTextEncodingType() == ui::DataPack::UTF16) { - msg = base::string16(reinterpret_cast<const char16*>(data.data()), + msg = base::string16(reinterpret_cast<const base::char16*>(data.data()), data.length() / 2); } else if (data_pack_->GetTextEncodingType() == ui::DataPack::UTF8) { msg = base::UTF8ToUTF16(data); |