chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java - Issue 1357563002: Expose FormatUrlForSecurityDisplay to Java on Android.

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/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

Issue 1357563002: Expose FormatUrlForSecurityDisplay to Java on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Using a fake scheme in the test makes formatUrlForSecurityDisplay be conservative, breaking the tes… Created 5 years, 3 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/UrlUtilities.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

index bd645fb1929f9896b426def51fd330a369c43456..52cd08d743527bc601aeabc4633fd88600a63304 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java

@@ -504,7 +504,7 @@ public class WebsiteSettingsPopup implements OnClickListener {

String originToDisplay;

try {

URI parsedUrl = new URI(mFullUrl);

- originToDisplay = UrlUtilities.getOriginForDisplay(parsedUrl, false);

+ originToDisplay = UrlUtilities.formatUrlForSecurityDisplay(parsedUrl, false);

} catch (URISyntaxException e) {

// The URL is invalid - just display the full URL.

originToDisplay = mFullUrl;