| Index: chrome_frame/simple_resource_loader.cc
|
| diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc
|
| index e6d5c6c3c2ea980f7bb4f2e5b17961f362ff691c..ad38feee0df6ae1751bd947134a2ca3b2f67b7a5 100644
|
| --- a/chrome_frame/simple_resource_loader.cc
|
| +++ b/chrome_frame/simple_resource_loader.cc
|
| @@ -245,10 +245,10 @@ std::wstring SimpleResourceLoader::GetLocalizedResource(int message_id) {
|
| }
|
|
|
| // Data pack encodes strings as either UTF8 or UTF16.
|
| - string16 msg;
|
| + base::string16 msg;
|
| if (data_pack_->GetTextEncodingType() == ui::DataPack::UTF16) {
|
| - msg = string16(reinterpret_cast<const char16*>(data.data()),
|
| - data.length() / 2);
|
| + msg = base::string16(reinterpret_cast<const char16*>(data.data()),
|
| + data.length() / 2);
|
| } else if (data_pack_->GetTextEncodingType() == ui::DataPack::UTF8) {
|
| msg = UTF8ToUTF16(data);
|
| }
|
|
|