| Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java
|
| index 7f075a2fd6b92a5d07db0426c9411a8f1f30391e..7cd9270e612a1d30384bebd5d26250ea86979455 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java
|
| @@ -13,7 +13,6 @@
|
| import android.graphics.Color;
|
| import android.graphics.Rect;
|
| import android.graphics.drawable.BitmapDrawable;
|
| -import android.net.Uri;
|
| import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
|
| import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
|
| import android.support.v7.widget.RecyclerView;
|
| @@ -221,22 +220,6 @@ void ensureIconIsAvailable(String pageUrl, String iconUrl, boolean isLargeIcon,
|
| }
|
|
|
| /**
|
| - * Returns a title suitable for display for a link (e.g. a most visited item). If |title| is
|
| - * non-empty, this simply returns it. Otherwise, returns a shortened form of the URL.
|
| - */
|
| - static String getTitleForDisplay(String title, String url) {
|
| - if (TextUtils.isEmpty(title) && url != null) {
|
| - Uri uri = Uri.parse(url);
|
| - String host = uri.getHost();
|
| - String path = uri.getPath();
|
| - if (host == null) host = "";
|
| - if (TextUtils.isEmpty(path) || path.equals("/")) path = "";
|
| - title = host + path;
|
| - }
|
| - return title;
|
| - }
|
| -
|
| - /**
|
| * Default constructor required for XML inflation.
|
| */
|
| public NewTabPageView(Context context, AttributeSet attrs) {
|
| @@ -1051,7 +1034,7 @@ public View createMostVisitedItemView(
|
| LayoutInflater inflater, MostVisitedItem item, boolean isInitialLoad) {
|
| final MostVisitedItemView view = (MostVisitedItemView) inflater.inflate(
|
| R.layout.most_visited_item, mMostVisitedLayout, false);
|
| - view.setTitle(getTitleForDisplay(item.getTitle(), item.getUrl()));
|
| + view.setTitle(TitleUtil.getTitleForDisplay(item.getTitle(), item.getUrl()));
|
| view.setOfflineAvailable(item.isOfflineAvailable());
|
|
|
| LargeIconCallback iconCallback = new LargeIconCallbackImpl(item, view, isInitialLoad);
|
|
|