Receiving and sending dismissal parameters

chrome/browser/resources/google_now/background.js

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 'use strict';
 
 /**
  * @fileoverview The event page for Google Now for Chrome implementation.
  * The Google Now event page gets Google Now cards from the server and shows
  * them as Chrome notifications.
@@ skipping 254 matching lines @@
                             ', ERROR=' + errorMessage);
             }
           });
     } catch (error) {
       console.error('Error in notifications.update: ' + error);
     }
   }
 
   notificationsData[card.notificationId] = {
     actionUrls: card.actionUrls,
-    version: card.version
+    version: card.version,
+    dismissalParameters: card.dismissal
   };
 }
 
 /**
  * Parses JSON response from the notification server, show notifications and
  * schedule next update.
  * @param {string} response Server response.
  * @param {function()} callback Completion callback.
  */
 function parseAndShowNotificationCards(response, callback) {
@@ skipping 171 matching lines @@
       });
     });
   });
 }
 
 /**
  * Sends a server request to dismiss a card.
  * @param {string} notificationId Unique identifier of the card.
  * @param {number} dismissalTimeMs Time of the user's dismissal of the card in
  *     milliseconds since epoch.
+ * @param {Object} dismissalParameters Dismissal parameters.
  * @param {function(boolean)} callbackBoolean Completion callback with 'success'
  *     parameter.
  */
 function requestCardDismissal(
-    notificationId, dismissalTimeMs, callbackBoolean) {
+    notificationId, dismissalTimeMs, dismissalParameters, callbackBoolean) {
   console.log('requestDismissingCard ' + notificationId + ' from ' +
       NOTIFICATION_CARDS_URL);
   recordEvent(DiagnosticEvent.DISMISS_REQUEST_TOTAL);
   // Send a dismiss request to the server.
-  var requestParameters = 'id=' + notificationId +
-                          '&dismissalAge=' + (Date.now() - dismissalTimeMs);
+  var requestParameters =

[rgustafson, 2013/06/27 02:32:40]

I wanted to just send a json object in the post body with the format from my
email. It makes the API definition much simpler. Unfortunately, the relative
times don't make it much simpler here.

But you can just stringify the whole thing then.

Then the content type would be "application/json". I want to make this behave
the same way for notification requests too (goodbye q), but thats a different
change.

[vadimt, 2013/06/27 19:52:56]

Done.

+      'id=' + notificationId +
+      '&age=' + (Date.now() - dismissalTimeMs) +
+      '&dismissal=' + escape(JSON.stringify(dismissalParameters));
   var request = buildServerRequest('dismiss');
   request.onloadend = function(event) {
     console.log('requestDismissingCard-onloadend ' + request.status);
     if (request.status == HTTP_OK)
       recordEvent(DiagnosticEvent.DISMISS_REQUEST_SUCCESS);
 
     callbackBoolean(request.status == HTTP_OK);
   };
 
   setAuthorization(request, function(success) {
@@ skipping 34 matching lines @@
     function doProcessDismissals() {
       if (items.pendingDismissals.length == 0) {
         dismissalAttempts.stop();
         onFinish(true);
         return;
       }
 
       // Send dismissal for the first card, and if successful, repeat
       // recursively with the rest.
       var dismissal = items.pendingDismissals[0];
-      requestCardDismissal(
-          dismissal.notificationId, dismissal.time, function(success) {
+      requestCardDismissal(dismissal.notificationId,
+                           dismissal.time,
+                           dismissal.parameters,
+                           function(success) {
         if (success) {
           dismissalsChanged = true;
           items.pendingDismissals.splice(0, 1);
           items.recentDismissals[dismissal.notificationId] = Date.now();
           doProcessDismissals();
         } else {
           onFinish(false);
         }
       });
     }
@@ skipping 92 matching lines @@
 
   tasks.add(DISMISS_CARD_TASK_NAME, function(callback) {
     dismissalAttempts.start();
 
     // Deleting the notification in case it was re-added while this task was
     // scheduled, waiting for execution.
     chrome.notifications.clear(
         notificationId,
         function() {});
 
-    tasks.debugSetStepName('onNotificationClosed-get-pendingDismissals');
-    storage.get('pendingDismissals', function(items) {
+    tasks.debugSetStepName('onNotificationClosed-storage-get');
+    storage.get(['pendingDismissals', 'notificationsData'], function(items) {
       items.pendingDismissals = items.pendingDismissals || [];
+      items.notificationsData = items.notificationsData || {};
+
+      var notificationData = items.notificationsData[notificationId];
 
       var dismissal = {
         notificationId: notificationId,
-        time: Date.now()
+        time: Date.now(),
+        parameters: notificationData && notificationData.dismissalParameters
       };
       items.pendingDismissals.push(dismissal);
       storage.set({pendingDismissals: items.pendingDismissals});
       processPendingDismissals(function(success) { callback(); });
     });
   });
 }
 
 /**
  * Initializes the polling system to start monitoring location and fetching
@@ skipping 86 matching lines @@
 
 chrome.location.onLocationUpdate.addListener(function(position) {
   recordEvent(DiagnosticEvent.LOCATION_UPDATE);
   updateNotificationsCards(position);
 });
 
 chrome.omnibox.onInputEntered.addListener(function(text) {
   localStorage['server_url'] = NOTIFICATION_CARDS_URL = text;
   initialize();
 });