chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.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/preferences/website/SingleWebsitePreferences.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: Rebase Created 4 years, 4 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/preferences/HomepageEditor.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.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/preferences/website/SingleWebsitePreferences.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java

index c2744080a13f9a02d0922095b858d59642c4a4a5..981c9866661702c1979dbeb95566df617fcea1c7 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java

@@ -25,7 +25,7 @@ import org.chromium.chrome.R;

import org.chromium.chrome.browser.ContentSettingsType;

import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader;

import org.chromium.chrome.browser.search_engines.TemplateUrlService;

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

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

import org.chromium.content_public.browser.WebContents;

import java.net.URI;

@@ -151,7 +151,7 @@ public class SingleWebsitePreferences extends PreferenceFragment

// TODO(mvanouwerkerk): Define a pure getOrigin method in UrlUtilities that is the

// equivalent of the call below, because this is perfectly fine for non-display purposes.

String origin =

- UrlUtilities.formatUrlForSecurityDisplay(URI.create(url), true /* showScheme */);

+ UrlFormatter.formatUrlForSecurityDisplay(URI.create(url), true /* showScheme */);

fragmentArgs.putString(SingleWebsitePreferences.EXTRA_ORIGIN, origin);

return fragmentArgs;

}