chrome_frame/simple_resource_loader.cc - Issue 113403006: Update some uses of char16 to use the base:: namespace.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome_frame/simple_resource_loader.cc

Issue 113403006: Update some uses of char16 to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome_frame/simple_resource_loader.cc

diff --git a/chrome_frame/simple_resource_loader.cc b/chrome_frame/simple_resource_loader.cc

index b6e21e6400c808f72b2d389a9b985ac4e8114500..22024f3d50894bb813d402f10be3edd66fe74027 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);