Integrate the notification database with the normal code path.

chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationConstants.java

Index: chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationConstants.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationConstants.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationConstants.java
index ff574db44f63bec95762599334f2b0b5e593530f..c5aafa6b15f76a574a3ec842f78580b60eb4c3ed 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationConstants.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationConstants.java
@@ -14,13 +14,18 @@ public class NotificationConstants {
     public static final String ACTION_CLOSE_NOTIFICATION =
             "org.chromium.chrome.browser.notifications.CLOSE_NOTIFICATION";
 
+    /**
+     * Intent extras passed to Chrome from intents triggered by the framework, notably the settings
+     * cog on the flipped side of notifications.
+     */
     public static final String EXTRA_NOTIFICATION_ID = "notification_id";
     public static final String EXTRA_NOTIFICATION_TAG = "notification_tag";

[johnme, 2015/04/08 17:33:32]

The comment seems inaccurate - from reading the code, it seems like
EXTRA_NOTIFICATION_TAG gets used in two cases:
- set by the system, in which case its value was constructed by makePlatformTag
- set by getPendingIntent, in which case its value is the actual tag provided by
the webapp

I'd recommend using a different intent key name in getPendingIntent, given that
these are semantically different datatypes.

[Peter Beverloo, 2015/04/08 18:57:47]

I've updated the comment. They will contain exactly the same value, so I'm all
for reusing this.

[johnme, 2015/04/09 10:06:11]

They don't contain the same value. Look at
NotificationUIManager.displayNotification: it passes the raw tag (from JS) to
getPendingIntent, but passes the output of makePlatformTag to
mNotificationManager.notify. And you only call getOriginFromTag from
launchNotificationPreferences.

Please use a different extras key for non-platform tag (or always use platform
tags in extras, if you'd prefer).

[Peter Beverloo, 2015/04/09 13:09:00]

Done.

 
-    // TODO(peter): Remove these extras once Notifications are powered by a database on the
-    // native side, that contains all the additional information.
-    public static final String EXTRA_NOTIFICATION_PLATFORM_ID = "notification_platform_id";
-    public static final String EXTRA_NOTIFICATION_DATA = "notification_data";
+    /**
+     * Intent extras psased to Chrome for intents created by the NotificationUIManager.

[johnme, 2015/04/08 17:33:32]

passed

[Peter Beverloo, 2015/04/08 18:57:47]

Done.

+     */
+    public static final String EXTRA_PERSISTENT_NOTIFICATION_ID = "notification_persistent_id";
+    public static final String EXTRA_NOTIFICATION_ORIGIN = "notification_origin";
 
     /**
      * Unique identifier for a single sync notification. Since the notification ID is reused,