chrome/android/java/src/org/chromium/chrome/browser/ntp/ContentSuggestionsNotificationHelper.java - Issue 2699253003: Abstracting over Notification.Builder + NotificationCompat.Builder

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/ContentSuggestionsNotificationHelper.java

Issue 2699253003: Abstracting over Notification.Builder + NotificationCompat.Builder (Closed)

Patch Set: remove erroneously added methods from rebase Created 3 years, 10 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/notifications/NotificationConstants.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d90e9f11133ed73ba70b39a888ff9e054e20de3c..0b07fedb35c34e2a4779bea639653dc50cedba11 100644

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

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

@@ -14,16 +14,18 @@ import android.content.SharedPreferences;

import android.graphics.Bitmap;

import android.net.Uri;

import android.provider.Browser;

-import android.support.v4.app.NotificationCompat;

import org.chromium.base.ContextUtils;

import org.chromium.base.annotations.CalledByNative;

import org.chromium.base.annotations.JNINamespace;

import org.chromium.base.library_loader.LibraryLoader;

import org.chromium.chrome.R;

+import org.chromium.chrome.browser.ChromeApplication;

import org.chromium.chrome.browser.IntentHandler;

import org.chromium.chrome.browser.ShortcutHelper;

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

+import org.chromium.chrome.browser.notifications.ChromeNotificationBuilder;

+import org.chromium.chrome.browser.notifications.NotificationConstants;

import org.chromium.chrome.browser.ntp.snippets.ContentSuggestionsNotificationAction;

import java.util.Collection;

@@ -146,8 +148,13 @@ public class ContentSuggestionsNotificationHelper {

.setData(uri)

.putExtra(NOTIFICATION_CATEGORY_EXTRA, category)

.putExtra(NOTIFICATION_ID_WITHIN_CATEGORY_EXTRA, idWithinCategory);

- NotificationCompat.Builder builder =

- new NotificationCompat.Builder(context)

+ ChromeNotificationBuilder builder =

+ ((ChromeApplication) context)

+ .createChromeNotificationBuilder(true /* preferCompat */,

+ NotificationConstants.CATEGORY_ID_BROWSER,

+ context.getString(R.string.notification_category_browser),

+ NotificationConstants.CATEGORY_GROUP_ID_GENERAL,

+ context.getString(R.string.notification_category_group_general))

.setAutoCancel(true)

.setContentIntent(PendingIntent.getBroadcast(context, 0, contentIntent, 0))

.setDeleteIntent(PendingIntent.getBroadcast(context, 0, deleteIntent, 0))