chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java - Issue 2110543004: Move JNI bindings for url_formatter from chrome to //components/url_formatter

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/pageinfo/WebsiteSettingsPopup.java

Issue 2110543004: Move JNI bindings for url_formatter from chrome to //components/url_formatter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: gyp: conditionally exclude Android sources Created 4 years, 6 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/notifications/NotificationPlatformBridge.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java » ('j') | components/url_formatter/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 66e8e1dc757692d898e0f13d041f2e4e67df14f7..f6ba1584175ad89b6fc4ddfb4d10326405e11874 100644

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

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

@@ -65,6 +65,7 @@ import org.chromium.chrome.browser.ssl.SecurityStateModel;

import org.chromium.chrome.browser.tab.Tab;

import org.chromium.chrome.browser.util.UrlUtilities;

import org.chromium.components.security_state.ConnectionSecurityLevel;

+import org.chromium.components.url_formatter.UrlFormatter;

import org.chromium.content.browser.ContentViewCore;

import org.chromium.content_public.browser.WebContents;

import org.chromium.content_public.browser.WebContentsObserver;

@@ -559,7 +560,7 @@ public class WebsiteSettingsPopup implements OnClickListener {

String originToDisplay;

try {

URI parsedUrl = new URI(mFullUrl);

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

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

} catch (URISyntaxException e) {

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

originToDisplay = mFullUrl;