chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java - Issue 1272883004: Popular sites on the NTP: Favicons!

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/ntp/NewTabPage.java

Issue 1272883004: Popular sites on the NTP: Favicons! (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@enable_popular_sites

Patch Set: . Created 5 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/favicon/FaviconHelper.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java » ('j') | chrome/browser/android/favicon_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java

index 38e73cdc7977e38b9fd9f08f48fd1e04ab1f7d54..93ee7a34f0a491dadc7f451666b59eeac63eaf5b 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java

@@ -27,6 +27,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.InvalidationAwareT

import org.chromium.chrome.browser.document.DocumentMetricIds;

import org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkUtils;

import org.chromium.chrome.browser.favicon.FaviconHelper;

+import org.chromium.chrome.browser.favicon.FaviconHelper.FaviconAvailabilityCallback;

import org.chromium.chrome.browser.favicon.FaviconHelper.FaviconImageCallback;

import org.chromium.chrome.browser.favicon.LargeIconBridge;

import org.chromium.chrome.browser.favicon.LargeIconBridge.LargeIconCallback;

@@ -341,11 +342,19 @@ public class NewTabPage

}

@Override

+ public void ensureFaviconIsAvailable(String pageUrl, String faviconUrl,

+ FaviconAvailabilityCallback callback) {

+ if (mIsDestroyed) return;

+ if (mFaviconHelper == null) mFaviconHelper = new FaviconHelper();

+ mFaviconHelper.ensureFaviconIsAvailable(mProfile, mTab.getWebContents(), pageUrl,

+ faviconUrl, callback);

+ }

+ @Override

public void openLogoLink() {

if (mIsDestroyed) return;

if (mOnLogoClickUrl == null) return;

- mTab.loadUrl(

- new LoadUrlParams(mOnLogoClickUrl, PageTransition.LINK));

+ mTab.loadUrl(new LoadUrlParams(mOnLogoClickUrl, PageTransition.LINK));

}

@Override