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

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.h

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

index 467bf178b913c5ee5d6303a6a25bef5bfbe1e5ce..b7639d28e2ef8f27040b20a303dcddda66f09186 100644

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

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

@@ -17,8 +17,9 @@ namespace l10n_util {

// Return the current default locale of the device.

UI_EXPORT std::string GetDefaultLocale();

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

- const std::string& display_locale);

+UI_EXPORT base::string16 GetDisplayNameForLocale(

+ const std::string& locale,

+ const std::string& display_locale);

UI_EXPORT bool RegisterLocalizationUtil(JNIEnv* env);

« no previous file with comments | « ui/base/ime/win/tsf_text_store_unittest.cc ('k') | ui/base/l10n/l10n_util_android.cc » ('j') | no next file with comments »