chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappUrlBar.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/webapps/WebappUrlBar.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/util/UrlUtilities.java ('k') | chrome/android/javatests/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridgeTest.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/webapps/WebappUrlBar.java

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

index 99823a9ca8ae061755fbf9c062dbd606ee4db94a..3f42afcc3cd9b9fabf3632e35372d5093574377d 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappUrlBar.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappUrlBar.java

@@ -22,7 +22,7 @@ import org.chromium.base.ApiCompatibilityUtils;

import org.chromium.base.VisibleForTesting;

import org.chromium.chrome.R;

import org.chromium.chrome.browser.omnibox.LocationBarLayout;

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

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

import org.chromium.ui.base.DeviceFormFactor;

import java.net.URI;

@@ -165,7 +165,7 @@ public class WebappUrlBar extends FrameLayout implements View.OnLayoutChangeList

boolean showScheme = mCurrentIconResource == 0;

String displayUrl = originalUrl;

if (uri != null) {

- String shortenedUrl = UrlUtilities.formatUrlForSecurityDisplay(uri, showScheme);

+ String shortenedUrl = UrlFormatter.formatUrlForSecurityDisplay(uri, showScheme);

if (!TextUtils.isEmpty(shortenedUrl)) displayUrl = shortenedUrl;

}