ui/base/l10n/l10n_util_android.cc - Issue 117983002: Prefix string16 with base:: in ui/.

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: ui/base/l10n/l10n_util_android.cc

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge 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: ui/base/l10n/l10n_util_android.cc

diff --git a/ui/base/l10n/l10n_util_android.cc b/ui/base/l10n/l10n_util_android.cc

index 62d919bdc804d3633245950ee77206c359e5d34d..96b19d40f3e3dbe9d46e5dc28fe8e0f42bdac035 100644

--- a/ui/base/l10n/l10n_util_android.cc

+++ b/ui/base/l10n/l10n_util_android.cc

@@ -73,8 +73,8 @@ ScopedJavaLocalRef<jobject> NewJavaLocale(

} // namespace

-string16 GetDisplayNameForLocale(const std::string& locale,

- const std::string& display_locale) {

+base::string16 GetDisplayNameForLocale(const std::string& locale,

+ const std::string& display_locale) {

JNIEnv* env = base::android::AttachCurrentThread();

ScopedJavaLocalRef<jobject> java_locale =

NewJavaLocale(env, locale);

« no previous file with comments | « ui/base/l10n/l10n_util_android.h ('k') | ui/base/l10n/l10n_util_collator.h » ('j') | no next file with comments »