Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(29)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageView.java

Issue 2105933002: NTP: Fix metrics recording crash by plumbing the necessary data to Java. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Even more fixes. 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
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 f6c875ccb5e14d0c7ea69f303fc5e8cb35a3f3c8..d3cf252dd48cfd92803d6ca6a0fda7c7b1968e91 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
@@ -822,8 +822,8 @@ public class NewTabPageView extends FrameLayout
// MostVisitedURLsObserver implementation
@Override
- public void onMostVisitedURLsAvailable(
- final String[] titles, final String[] urls, final String[] whitelistIconPaths) {
+ public void onMostVisitedURLsAvailable(final String[] titles, final String[] urls,
+ final String[] whitelistIconPaths, final int[] sources, final int[] providerIndexes) {
Set<String> urlSet = new HashSet<>(Arrays.asList(urls));
// TODO(https://crbug.com/607573): We should show offline-available content in a nonblocking
@@ -832,13 +832,15 @@ public class NewTabPageView extends FrameLayout
mManager.getUrlsAvailableOffline(urlSet, new Callback<Set<String>>() {
@Override
public void onResult(Set<String> offlineUrls) {
- onOfflineUrlsAvailable(titles, urls, whitelistIconPaths, offlineUrls);
+ onOfflineUrlsAvailable(
+ titles, urls, whitelistIconPaths, offlineUrls, sources, providerIndexes);
}
});
}
private void onOfflineUrlsAvailable(final String[] titles, final String[] urls,
- final String[] whitelistIconPaths, final Set<String> offlineUrls) {
+ final String[] whitelistIconPaths, final Set<String> offlineUrls, final int[] sources,
+ final int[] providerIndexes) {
mMostVisitedLayout.removeAllViews();
MostVisitedItem[] oldItems = mMostVisitedItems;
@@ -853,6 +855,9 @@ public class NewTabPageView extends FrameLayout
final String url = urls[i];
final String title = titles[i];
final String whitelistIconPath = whitelistIconPaths[i];
+ final int source = sources[i];
+ final int providerIndex = providerIndexes[i];
+
boolean offlineAvailable = offlineUrls.contains(url);
// Look for an existing item to reuse.
@@ -872,8 +877,8 @@ public class NewTabPageView extends FrameLayout
// If nothing can be reused, create a new item.
if (item == null) {
- item = new MostVisitedItem(
- mManager, title, url, whitelistIconPath, offlineAvailable, i);
+ item = new MostVisitedItem(mManager, title, url, whitelistIconPath,
+ offlineAvailable, i, source, providerIndex);
View view =
mMostVisitedDesign.createMostVisitedItemView(inflater, item, isInitialLoad);
item.initView(view);

Powered by Google App Engine
This is Rietveld 408576698