chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkEditActivity.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/bookmarks/BookmarkEditActivity.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/BUILD.gn ('k') | chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaSessionTabHelper.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/bookmarks/BookmarkEditActivity.java

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

index 5acc04218e21a36e2bb5b0d113f13009c2394b7b..d8e85f31d741364f863fc14bf9563fded099860c 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkEditActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkEditActivity.java

@@ -17,10 +17,10 @@ import org.chromium.chrome.R;

import org.chromium.chrome.browser.SynchronousInitializationActivity;

import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;

import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkModelObserver;

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

import org.chromium.chrome.browser.widget.EmptyAlertEditText;

import org.chromium.chrome.browser.widget.TintedDrawable;

import org.chromium.components.bookmarks.BookmarkId;

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

/**

* The activity that enables the user to modify the title, url and parent folder of a bookmark.

@@ -142,7 +142,7 @@ public class BookmarkEditActivity extends SynchronousInitializationActivity {

if (!mUrlEditText.isEmpty()

&& mModel.getBookmarkById(mBookmarkId).isUrlEditable()) {

- String fixedUrl = UrlUtilities.fixupUrl(url);

+ String fixedUrl = UrlFormatter.fixupUrl(url);

if (fixedUrl != null && !fixedUrl.equals(originalUrl)) {

mModel.setBookmarkUrl(mBookmarkId, fixedUrl);

}