Commit bb542055 authored by Michael Thiessen's avatar Michael Thiessen Committed by Commit Bot

Avoid crashing when interacting with NTP menu after destroying NTP.

Bug: 982829
Change-Id: I635990f11c04ad8aa098852731832671b5362d00
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1699224Reviewed-by: default avatarCathy Li <chili@chromium.org>
Commit-Queue: Michael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#676630}
parent 640ac434
...@@ -85,21 +85,25 @@ public class MostVisitedSitesBridge ...@@ -85,21 +85,25 @@ public class MostVisitedSitesBridge
@Override @Override
public void addBlacklistedUrl(String url) { public void addBlacklistedUrl(String url) {
if (mNativeMostVisitedSitesBridge == 0) return;
nativeAddOrRemoveBlacklistedUrl(mNativeMostVisitedSitesBridge, url, true); nativeAddOrRemoveBlacklistedUrl(mNativeMostVisitedSitesBridge, url, true);
} }
@Override @Override
public void removeBlacklistedUrl(String url) { public void removeBlacklistedUrl(String url) {
if (mNativeMostVisitedSitesBridge == 0) return;
nativeAddOrRemoveBlacklistedUrl(mNativeMostVisitedSitesBridge, url, false); nativeAddOrRemoveBlacklistedUrl(mNativeMostVisitedSitesBridge, url, false);
} }
@Override @Override
public void recordPageImpression(int tilesCount) { public void recordPageImpression(int tilesCount) {
if (mNativeMostVisitedSitesBridge == 0) return;
nativeRecordPageImpression(mNativeMostVisitedSitesBridge, tilesCount); nativeRecordPageImpression(mNativeMostVisitedSitesBridge, tilesCount);
} }
@Override @Override
public void recordTileImpression(Tile tile) { public void recordTileImpression(Tile tile) {
if (mNativeMostVisitedSitesBridge == 0) return;
nativeRecordTileImpression(mNativeMostVisitedSitesBridge, tile.getIndex(), tile.getType(), nativeRecordTileImpression(mNativeMostVisitedSitesBridge, tile.getIndex(), tile.getType(),
tile.getIconType(), tile.getTitleSource(), tile.getSource(), tile.getIconType(), tile.getTitleSource(), tile.getSource(),
tile.getData().dataGenerationTime.getTime(), tile.getUrl()); tile.getData().dataGenerationTime.getTime(), tile.getUrl());
...@@ -107,6 +111,7 @@ public class MostVisitedSitesBridge ...@@ -107,6 +111,7 @@ public class MostVisitedSitesBridge
@Override @Override
public void recordOpenedMostVisitedItem(Tile tile) { public void recordOpenedMostVisitedItem(Tile tile) {
if (mNativeMostVisitedSitesBridge == 0) return;
nativeRecordOpenedMostVisitedItem(mNativeMostVisitedSitesBridge, tile.getIndex(), nativeRecordOpenedMostVisitedItem(mNativeMostVisitedSitesBridge, tile.getIndex(),
tile.getType(), tile.getTitleSource(), tile.getSource(), tile.getType(), tile.getTitleSource(), tile.getSource(),
tile.getData().dataGenerationTime.getTime()); tile.getData().dataGenerationTime.getTime());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment