Update notifications API after review.

chrome/test/data/extensions/api_test/notification/galore/app/controller.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.
 
 var Galore = Galore || {};
 
 Galore.controller = {
 
   BUTTON_IMAGE_SIZE: 64,
   NOTIFICATION_ICON_SIZE: 80,
@@ skipping 15 matching lines @@
   listen_: function(event) {
     var listener = this.event_.bind(this, event);
     chrome.experimental.notification[event].addListener(listener);
   },
 
   /** @private */
   prepare_: function() {
     Galore.NOTIFICATIONS.forEach(function (type) {
       type.notifications.forEach(function (options) {
         this.view.addNotificationButton(
-            type.type,
+            type.templateType,

[miket_OOO, 2013/02/06 18:42:34]

I seem to have broken the @ replacement scheme you use in the button icon URLs,
but I'm not sure how to fix it. Can you help?

[dharcourt, 2013/02/06 21:34:20]

The icons shouldn't be broken, but the button images will be because their URLs
moved down into the property of an object in an array, and replace_() wasn't
written to handle that. The updated replace_() implementation in my comment
below _should_ fix that, but I haven't tested it. If you want, feel free to
leave it broken and I can test and fix that in a separate change list once your
API changes have landed.

             type.name,
             this.replace_(options.iconUrl, this.BUTTON_IMAGE_SIZE),
-            this.notify_.bind(this, type.type, options));
+            this.notify_.bind(this, type.templateType, options));
       }, this);
     }, this);
   },
 
   /** @private */
   id_: function() {
     this.counter += 1;
     return String(this.counter);
   },
 
@@ skipping 10 matching lines @@
       delete expanded.buttonOneTitle;
       delete expanded.buttonTwoIconUrl;
       delete expanded.buttonTwoTitle;
       chrome.experimental.notification.show(expanded, function() {});
     }
     this.event_('create', id, 'priority: ' + priority);
   },
 
   /** @private */
   expand_: function(options, type, priority) {
-    var expanded = {type: type, priority: priority};
+    var expanded = {templateType: type, priority: priority};
     Object.keys(options).forEach(function (key) {
       expanded[key] = this.replace_(options[key], this.NOTIFICATION_ICON_SIZE);
     }, this);
     return expanded;
   },
 
   /** @private */
   replace_: function(option, size) {
     var replaced = option;
     if (typeof replaced === 'string') {
       replaced = replaced.replace(/\$#/g, this.counter);
       replaced = replaced.replace(/\$@/g, this.prefix);
       replaced = replaced.replace(/\$%/g, size);
     }
     return replaced;
   },

[dharcourt, 2013/02/06 21:34:20]

  replace_: function(option, size) {
    var replaced;
    if (typeof option === 'string') {
      replaced = option.replace(/\$#/g, this.counter);
      replaced = replaced.replace(/\$@/g, this.prefix);
      replaced = replaced.replace(/\$%/g, size);
    } else if (Array.isArray(option)) {
      replaced = [];
      option.forEach(function(element) {
        replaced.push(this.replace_(element, size));
      }, this);
    } else {
      replaced = {};
      Object.keys(option).forEach(function (key) {
        replaced[key] = this.replace_(option[key], size);
      }, this);
    }
    return replaced;
  },

 
   /** @private */
   event_: function(event, id, var_args) {
     this.view.logEvent('Notification #' + id + ': ' + event + '(' +
                        Array.prototype.slice.call(arguments, 2).join(', ') +
                        ')');
   }
 
 };