Combining cards instead of merging

chrome/browser/resources/google_now/utility.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 Utility objects and functions for Google Now extension.
  * Most important entities here:
  * (1) 'wrapper' is a module used to add error handling and other services to
@@ skipping 189 matching lines @@
   /**
    * Factory for wrapper plugins. If specified, it's used to generate an
    * instance of WrapperPlugin each time we wrap a callback (which corresponds
    * to addListener call for Chrome events, and to every API call that specifies
    * a callback). WrapperPlugin's lifetime ends when the callback for which it
    * was generated, exits. It's possible to have several instances of
    * WrapperPlugin at the same time.
    * An instance of WrapperPlugin can have state that can be shared by its
    * constructor, prologue() and epilogue(). Also WrapperPlugins can change
    * state of other objects, for example, to do refcounting.
-   * @type {function(): WrapperPlugin}
+   * @type {?function(): WrapperPlugin}
    */
   var wrapperPluginFactory = null;
 
   /**
    * Registers a wrapper plugin factory.
    * @param {function(): WrapperPlugin} factory Wrapper plugin factory.
    */
   function registerWrapperPluginFactory(factory) {
     if (wrapperPluginFactory) {
       reportError(buildErrorWithMessageForServer(
@@ skipping 484 matching lines @@
    */
   function isSignedIn(callback) {
     instrumented.webstorePrivate.getBrowserLogin(function(accountInfo) {
       callback(!!accountInfo.login);
     });
   }
 
   /**
    * Removes the specified cached token.
    * @param {string} token Authentication Token to remove from the cache.
-   * @param {function} callback Called on completion.
+   * @param {function()} callback Called on completion.
    */
   function removeToken(token, callback) {
     instrumented.identity.removeCachedAuthToken({token: token}, function() {
       // Let Chrome now about a possible problem with the token.
       getAuthToken(function() {});
       callback();
     });
   }
 
   var listeners = [];
 
   /**
    * Registers a listener that gets called back when the signed in state
    * is found to be changed.
-   * @param {function} callback Called when the answer to isSignedIn changes.
+   * @param {function()} callback Called when the answer to isSignedIn changes.
    */
   function addListener(callback) {
     listeners.push(callback);
   }
 
   /**
    * Checks if the last signed in state matches the current one.
    * If it doesn't, it notifies the listeners of the change.
    */
   function checkAndNotifyListeners() {
@@ skipping 24 matching lines @@
   // One hour is just an arbitrary amount of time chosen.
   chrome.alarms.create(alarmName, {periodInMinutes: 60});
 
   return {
     addListener: addListener,
     getAuthToken: getAuthToken,
     isSignedIn: isSignedIn,
     removeToken: removeToken
   };
 }