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

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

Issue 2608333004: Clarify that NTPSnippetsBridge holds a Java SnippetsBridge. (Closed)
Patch Set: Add null checks for the Java observer. Created 3 years, 11 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 | « no previous file | chrome/browser/android/ntp/ntp_snippets_bridge.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsBridge.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsBridge.java
index 4625b133e6d759f246aafcec3dd53b68e7adb4b4..cf3612c9c78aba4a0a55e6990f2563ce3ce8326a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/snippets/SnippetsBridge.java
@@ -189,22 +189,16 @@ public class SnippetsBridge implements SuggestionsSource {
* An observer needs to be set before the native code attempts to transmit snippets them to
* java. Upon registration, the observer will be notified of already fetched snippets.
*
- * @param observer object to notify when snippets are received, or {@code null} if we want to
- * stop observing.
+ * @param observer object to notify when snippets are received.
*/
@Override
public void setObserver(SuggestionsSource.Observer observer) {
- assert mObserver == null || mObserver == observer;
-
+ assert observer != null;
mObserver = observer;
- nativeSetObserver(mNativeSnippetsBridge, observer == null ? null : this);
}
@Override
public void fetchSuggestions(@CategoryInt int category, String[] displayedSuggestionIds) {
- assert mNativeSnippetsBridge != 0;
- assert mObserver != null;
-
nativeFetch(mNativeSnippetsBridge, category, displayedSuggestionIds);
}
@@ -251,16 +245,12 @@ public class SnippetsBridge implements SuggestionsSource {
@CalledByNative
private void onNewSuggestions(@CategoryInt int category) {
- assert mNativeSnippetsBridge != 0;
- assert mObserver != null;
- mObserver.onNewSuggestions(category);
+ if (mObserver != null) mObserver.onNewSuggestions(category);
}
@CalledByNative
private void onMoreSuggestions(@CategoryInt int category, List<SnippetArticle> suggestions) {
- assert mNativeSnippetsBridge != 0;
- assert mObserver != null;
- mObserver.onMoreSuggestions(category, suggestions);
+ if (mObserver != null) mObserver.onMoreSuggestions(category, suggestions);
}
@CalledByNative
@@ -314,5 +304,4 @@ public class SnippetsBridge implements SuggestionsSource {
long nativeNTPSnippetsBridge, int category, int position);
private static native void nativeOnSuggestionTargetVisited(int category, long visitTimeMs);
private static native void nativeOnNTPInitialized(long nativeNTPSnippetsBridge);
- private native void nativeSetObserver(long nativeNTPSnippetsBridge, SnippetsBridge bridge);
}
« no previous file with comments | « no previous file | chrome/browser/android/ntp/ntp_snippets_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698