Allow the background page to get an OAuth token for apps v1.

remoting/webapp/crd/js/host_list.js

 // Copyright (c) 2012 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.
 
 /**
  * @fileoverview
  * Class representing the host-list portion of the home screen UI.
  */
 
 'use strict';
@@ skipping 96 matching lines @@
  *
  * @param {function():void} onDone Completion callback.
  */
 remoting.HostList.prototype.load = function(onDone) {
   // Load the cache of the last host-list, if present.
   /** @type {remoting.HostList} */
   var that = this;
   /** @param {Object.<string>} items */
   var storeHostList = function(items) {
     if (items[remoting.HostList.HOSTS_KEY]) {
-      var cached = jsonParseSafe(items[remoting.HostList.HOSTS_KEY]);
+      var cached = base.jsonParseSafe(items[remoting.HostList.HOSTS_KEY]);
       if (cached) {
         that.hosts_ = /** @type {Array} */ cached;
       } else {
         console.error('Invalid value for ' + remoting.HostList.HOSTS_KEY);
       }
     }
     onDone();
   };
   chrome.storage.local.get(remoting.HostList.HOSTS_KEY, storeHostList);
 };
@@ skipping 63 matching lines @@
  *
  * @param {function(boolean):void} onDone The callback passed to |refresh|.
  * @param {XMLHttpRequest} xhr The XHR object for the host list request.
  * @return {void} Nothing.
  * @private
  */
 remoting.HostList.prototype.parseHostListResponse_ = function(onDone, xhr) {
   this.lastError_ = '';
   try {
     if (xhr.status == 200) {
-      var response =
-          /** @type {{data: {items: Array}}} */ jsonParseSafe(xhr.responseText);
+      var response = /** @type {{data: {items: Array}}} */
+          (base.jsonParseSafe(xhr.responseText));
       if (response && response.data) {
         if (response.data.items) {
           this.hosts_ = response.data.items;
           /**
            * @param {remoting.Host} a
            * @param {remoting.Host} b
            */
           var cmp = function(a, b) {
             if (a.status < b.status) {
               return 1;
@@ skipping 277 matching lines @@
 };
 
 /**
  * Called when the user clicks the button next to the error message. The action
  * depends on the error.
  *
  * @private
  */
 remoting.HostList.prototype.onErrorClick_ = function() {
   if (this.lastError_ == remoting.Error.AUTHENTICATION_FAILED) {
-    remoting.oauth2.doAuthRedirect();
+    remoting.oauth2.doAuthRedirect(function() {
+      window.location.reload();
+    });
   } else {
     this.refresh(remoting.updateLocalHostState);
   }
 };
 
 /**
  * Save the host list to local storage.
  */
 remoting.HostList.prototype.save_ = function() {
   var items = {};
   items[remoting.HostList.HOSTS_KEY] = JSON.stringify(this.hosts_);
   chrome.storage.local.set(items);
 };
 
 /**
  * Key name under which Me2Me hosts are cached.
  */
 remoting.HostList.HOSTS_KEY = 'me2me-cached-hosts';
 
 /** @type {remoting.HostList} */
 remoting.hostList = null;