[Sync] Clean up notifications tab in chrome://sync-internals

chrome/browser/resources/sync_internals/notifications.html

Index: chrome/browser/resources/sync_internals/notifications.html
diff --git a/chrome/browser/resources/sync_internals/notifications.html b/chrome/browser/resources/sync_internals/notifications.html
index dccc68c90f61380b22ed43a564069ef704486989..0916fc59734e6d5fef2ed3925bd30f1d0f9191d9 100644
--- a/chrome/browser/resources/sync_internals/notifications.html
+++ b/chrome/browser/resources/sync_internals/notifications.html
@@ -1,9 +1,7 @@
 <script>
 (function () {
-// Contains all notifications received since the page was loaded as a
-// map from each data type to the number of notifications received for
-// it.
-chrome.sync.notifications = {};
+
+// TODO(akalin): Use table.js.
 
 function updateNotificationsEnabledInfo(notificationsEnabled) {
   var notificationsEnabledInfo =
@@ -13,13 +11,67 @@ function updateNotificationsEnabledInfo(notificationsEnabled) {
       notificationsEnabledInfo);
 }
 
-function updateNotificationInfo(notification) {
-  var notificationInfo = document.getElementById('notificationInfo');
-  jstProcess(
-      new JsEvalContext({
-        'notificationInfo': JSON.stringify(notification, null, 2)
-      }),
-      notificationInfo);
+// Contains all notification data.  The keys are sync types (as strings) and
+// the value is a dictionary with:
+//
+//   type: the sync type again (for convenience when using JsTemplate)
+//   totalCount: Number of notifications received since browser start.
+//   sessionCount: Number of notifications received this
+//                 chrome://sync-internals session.
+//   payload: The last received payload.
+//
+chrome.sync.notifications = {};
+
+/**
+ * Merges d1 and d2 (with d2 taking precedence) and returns the result.
+ */
+function mergeDictionaries(d1, d2) {
+  var d = {};
+  for (var k in d1) {
+    d[k] = d1[k];
+  }
+  for (var k in d2) {
+    d[k] = d2[k];
+  }
+  return d;
+}
+
+/**
+ * Merge notificationInfo into chrome.sync.notifications.
+ */
+function updateNotificationsFromNotificationInfo(notificationInfo) {
+  for (var k in notificationInfo) {
+    chrome.sync.notifications[k] =
+        mergeDictionaries(chrome.sync.notifications[k] || {},
+                          notificationInfo[k]);
+    // notificationInfo[k] has values for the totalCount and payload keys,
+    // so fill in the rest (if necessary).
+    chrome.sync.notifications[k].type = k;
+    chrome.sync.notifications[k].sessionCount =
+        chrome.sync.notifications[k].sessionCount || 0;
+  }
+}
+
+function incrementSessionNotificationCount(changedType) {
+  chrome.sync.notifications[changedType].sessionCount =
+      chrome.sync.notifications[changedType].sessionCount || 0;
+  ++chrome.sync.notifications[changedType].sessionCount;
+}
+
+function updateNotificationInfoTable() {
+  var notificationInfoTable =
+      document.getElementById('notificationInfo');
+  var infos = [];
+  for (var k in chrome.sync.notifications) {
+    infos.push(chrome.sync.notifications[k]);
+  }
+  jstProcess(new JsEvalContext({ 'notifications': infos }),
+             notificationInfoTable);
+}
+
+function updateNotificationInfo(notificationInfo) {
+  updateNotificationsFromNotificationInfo(notificationInfo);
+  updateNotificationInfoTable();
 }
 
 function onLoad() {
@@ -31,25 +83,11 @@ function onLoad() {
   chrome.sync.onIncomingNotification.addListener(function(details) {
     var changedTypes = details.changedTypes;
     for (var i = 0; i < changedTypes.length; ++i) {
-      var changedType = changedTypes[i];
-      chrome.sync.notifications[changedType] =
-          chrome.sync.notifications[changedType] || 0;
-      ++chrome.sync.notifications[changedType];
-    }
-
-    var infos = [];
-    for (var k in chrome.sync.notifications) {
-      var info = {
-        'modelType': k,
-        'notificationCount': chrome.sync.notifications[k]
-      };
-      infos.push(info);
+      incrementSessionNotificationCount(changedTypes[i]);
     }
+    updateNotificationInfoTable();
 
-    var notificationsInfo =
-        document.getElementById('notificationsInfo');
-    jstProcess(new JsEvalContext({ 'notifications': infos }),
-               notificationsInfo);
+    // Also update total counts.
     chrome.sync.getNotificationInfo(updateNotificationInfo);
   });
 }
@@ -59,7 +97,7 @@ document.addEventListener("DOMContentLoaded", onLoad, false);
 </script>
 
 <style>
-table#notificationsInfo tr:nth-child(odd) {
+table#notificationInfo tr:nth-child(odd) {
   background: #eff3ff;
 }
 </style>
@@ -67,10 +105,17 @@ table#notificationsInfo tr:nth-child(odd) {
 <p id='notificationsEnabledInfo'>
   Enabled: <span jscontent='notificationsEnabled'></span>
 </p>
-<pre id='notificationInfo'><span jscontent='notificationInfo'></span></pre>
-<table id='notificationsInfo'>
+<table id='notificationInfo'>
+  <tr>
+    <th>Type</th>
+    <th>Total count</th>
+    <th>Session count</th>
+    <th>Payload</th>
+  </tr>
   <tr jsselect='notifications'>
-    <td jscontent='modelType'/>
-    <td jscontent='notificationCount'/>
+    <td jscontent='type'/>
+    <td jscontent='totalCount'/>
+    <td jscontent='sessionCount'/>
+    <td jscontent='payload'/>
   </tr>
 </table>