chrome/browser/android/url_utilities.cc - Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode

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/browser/android/url_utilities.cc

Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebased, most Android targets locally built successfully Created 4 years, 9 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/android/omnibox/autocomplete_controller_android.cc ('K') | « chrome/browser/android/password_ui_view_android.cc ('k') | chrome/browser/autocomplete/in_memory_url_index_factory.cc » ('j') | components/omnibox/browser/bookmark_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/url_utilities.cc

diff --git a/chrome/browser/android/url_utilities.cc b/chrome/browser/android/url_utilities.cc

index a70609fe78c735cad77d2f138fd38d33c3ddfb9b..b07b802d726b2293a635ec85b30b830ecf2273af 100644

--- a/chrome/browser/android/url_utilities.cc

+++ b/chrome/browser/android/url_utilities.cc

@@ -88,7 +88,7 @@ static ScopedJavaLocalRef<jstring> FormatUrlForSecurityDisplay(

const JavaParamRef<jstring>& url) {

return base::android::ConvertUTF16ToJavaString(

env, url_formatter::FormatUrlForSecurityDisplay(

- ConvertJavaStringToGURL(env, url), std::string()));

+ ConvertJavaStringToGURL(env, url)));

}

static ScopedJavaLocalRef<jstring> FormatUrlForSecurityDisplayOmitScheme(

@@ -97,7 +97,7 @@ static ScopedJavaLocalRef<jstring> FormatUrlForSecurityDisplayOmitScheme(

const JavaParamRef<jstring>& url) {

return base::android::ConvertUTF16ToJavaString(

env, url_formatter::FormatUrlForSecurityDisplayOmitScheme(

- ConvertJavaStringToGURL(env, url), std::string()));

+ ConvertJavaStringToGURL(env, url)));

}

static jboolean IsGoogleHomePageUrl(JNIEnv* env,