chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.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/payments/PaymentRequestImpl.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/pageinfo/WebsiteSettingsPopup.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/preferences/HomepageEditor.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/payments/PaymentRequestImpl.java

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

index f8a0a0ef10410cd0d1d5f97b3f7450f428ea967b..78080445f564bc66e827ff08f2834c9c6332331b 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

@@ -25,8 +25,8 @@ import org.chromium.chrome.browser.payments.ui.PaymentRequestUI;

import org.chromium.chrome.browser.payments.ui.SectionInformation;

import org.chromium.chrome.browser.payments.ui.ShoppingCart;

import org.chromium.chrome.browser.profiles.Profile;

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

import org.chromium.components.safejson.JsonSanitizer;

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

import org.chromium.content_public.browser.WebContents;

import org.chromium.mojo.system.MojoException;

import org.chromium.mojom.payments.PaymentComplete;

@@ -182,7 +182,7 @@ public class PaymentRequestImpl implements PaymentRequest, PaymentRequestUI.Clie

mDismissObserver = dismissObserver;

mMerchantName = webContents.getTitle();

// The feature is available only in secure context, so it's OK to not show HTTPS.

- mOrigin = UrlUtilities.formatUrlForSecurityDisplay(webContents.getVisibleUrl(), false);

+ mOrigin = UrlFormatter.formatUrlForSecurityDisplay(webContents.getVisibleUrl(), false);

final FaviconHelper faviconHelper = new FaviconHelper();

faviconHelper.getLocalFaviconImageForURL(Profile.getLastUsedProfile(),