app/resource_bundle_win.cc - Issue 6315002: Some wstring -> string16 conversion in src/app.

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: app/resource_bundle_win.cc

Issue 6315002: Some wstring -> string16 conversion in src/app. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/app

Patch Set: rebase Created 9 years, 11 months 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: app/resource_bundle_win.cc

diff --git a/app/resource_bundle_win.cc b/app/resource_bundle_win.cc

index 89a68e139ab289c464de91e2fa061dc0bb5f7eaa..616faac4a146685d785ba1e309789e2df23a97fb 100644

--- a/app/resource_bundle_win.cc

+++ b/app/resource_bundle_win.cc

@@ -159,7 +159,7 @@ string16 ResourceBundle::GetLocalizedString(int message_id) {

// See http://crbug.com/21925.

base::debug::StackTrace().PrintBacktrace();

NOTREACHED() << "unable to find resource: " << message_id;

- return std::wstring();

+ return string16();

}

// Copy into a string16 and return.