Updated Google Now to Check the Geolocation Access Preference

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';
 
 // TODO(vadimt): Remove alerts.
 
 /**
  * @fileoverview Utility objects and functions for Google Now extension.
@@ skipping 112 matching lines @@
 
     return true;
   }
 
   /**
    * Adds a new task. If another task is not running, runs the task immediately.
    * If any task in the queue is not compatible with the task, ignores the new
    * task. Otherwise, stores the task for future execution.
    * @param {string} taskName Name of the task.
    * @param {function(function())} task Function to run. Takes a callback
-   *     parameter.
+   *     parameter. Call this callback on completion.
    */
   function add(taskName, task) {
     console.log('Adding task ' + taskName);
     if (!canQueue(taskName))
       return;
 
     queue.push({name: taskName, task: task});
 
     if (queue.length == 1) {
       startFirst();
@@ skipping 181 matching lines @@
    */
   function createAlarm(delaySeconds) {
     var alarmInfo = {
       delayInMinutes: delaySeconds / 60,
       periodInMinutes: maximumDelaySeconds / 60
     };
     chrome.alarms.create(alarmName, alarmInfo);
   }
 
   /**
+   * Indicates if this attempt manager has started.
+   * @param {function(boolean)} callback The function's boolean parameter is
+   *     true if the attempt manager has started, false otherwise.
+   */
+  function isRunning(callback) {
+    chrome.alarms.get(alarmName, function(alarmInfo) {
+      callback(!!alarmInfo);
+    });
+  }
+
+  /**
    * Schedules next attempt.
    * @param {number=} opt_previousDelaySeconds Previous delay in a sequence of
    *     retry attempts, if specified. Not specified for scheduling first retry
    *     in the exponential sequence.
    */
   function scheduleNextAttempt(opt_previousDelaySeconds) {
     var base = opt_previousDelaySeconds ? opt_previousDelaySeconds * 2 :
                                           initialDelaySeconds;
     var newRetryDelaySeconds =
         Math.min(base * (1 + 0.2 * Math.random()), maximumDelaySeconds);
@@ skipping 36 matching lines @@
   function planForNext(callback) {
     storage.get(currentDelayStorageKey, function(items) {
       console.log('planForNext-get-storage ' + JSON.stringify(items));
       scheduleNextAttempt(items[currentDelayStorageKey]);
       callback();
     });
   }
 
   chrome.alarms.onAlarm.addListener(function(alarm) {
     if (alarm.name == alarmName)
-      attempt();
+      isRunning(function(running) {
+        if (running)
+          attempt();
+      });
   });
 
   return {
     start: start,
     planForNext: planForNext,
-    stop: stop
+    stop: stop,
+    isRunning: isRunning
   };
 }
+