filemanager: Fix GetDriveConnectionStateFunctionChange to return "offline" when DriveSystemService …

chrome/browser/resources/file_manager/js/file_manager.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.
 
 // This variable is checked in SelectFileDialogExtensionBrowserTest.
 var JSErrorCount = 0;
 
 /**
  * Count uncaught exceptions.
  */
@@ skipping 110 matching lines @@
  * List of reasons of DriveConnectionType.
  *
  * Keep this in sync with the kDriveConnectionReason constants in
  * file_browser_private_api.cc.
  *
  * @enum {string}
  */
 var DriveConnectionReason = {
   NOT_READY: 'not_ready',  // Drive is not ready or authentication is failed.
   NO_NETWORK: 'no_network',  // Network connection is unavailable.
+  NO_SERVICE: 'no_service',  // Drive service is unavailable.

[yoshiki, 2013/02/12 06:29:15]

nit: Please remove the last comma.

[Haruki Sato, 2013/02/12 06:34:07]

Done with a padding fix.
Thanks.

 };
 
 /**
  * @param {string} type Dialog type.
  * @return {boolean} Whether the type is modal.
  */
 DialogType.isModal = function(type) {
   return type == DialogType.SELECT_FOLDER ||
       type == DialogType.SELECT_SAVEAS_FILE ||
       type == DialogType.SELECT_OPEN_FILE ||
@@ skipping 1537 matching lines @@
     var done = function() {
       if (--downcount == 0)
         callback();
     };
 
     chrome.fileBrowserPrivate.getPreferences(function(prefs) {
       self.preferences_ = prefs;
       done();
     });
 
-    chrome.fileBrowserPrivate.getDriveConnectionState(function(networkState) {
-      self.networkState_ = networkState;
+    chrome.fileBrowserPrivate.getDriveConnectionState(function(state) {
+      self.driveConnectionState_ = state;
       done();
     });
   };
 
   FileManager.prototype.onNetworkStateOrPreferencesChanged_ = function() {
     var self = this;
     this.updateNetworkStateAndPreferences_(function() {
       var drive = self.preferences_;
-      var network = self.networkState_;
+      var connection = self.driveConnectionState_;
 
       self.initDateTimeFormatters_();
       self.refreshCurrentDirectoryMetadata_();
 
       self.directoryModel_.setDriveEnabled(self.isDriveEnabled());
-      self.directoryModel_.setDriveOffline(network.type == 'offline');
+      self.directoryModel_.setDriveOffline(connection.type == 'offline');
 
       if (drive.cellularDisabled)
         self.syncButton.setAttribute('checked', '');
       else
         self.syncButton.removeAttribute('checked');
 
       if (self.hostedButton.hasAttribute('checked') !=
           drive.hostedFilesDisabled && self.isOnDrive()) {
         self.directoryModel_.rescan();
       }
 
       if (!drive.hostedFilesDisabled)
         self.hostedButton.setAttribute('checked', '');
       else
         self.hostedButton.removeAttribute('checked');
 
-      switch (network.type) {
+      switch (connection.type) {
         case DriveConnectionType.ONLINE:
           self.dialogContainer_.removeAttribute('connection');
           break;
         case DriveConnectionType.METERED:
           self.dialogContainer_.setAttribute('connection', 'metered');
           break;
         case DriveConnectionType.OFFLINE:
           self.dialogContainer_.setAttribute('connection', 'offline');
           break;
         default:
           console.assert(true, 'unknown connection type.');
       }
     });
   };
 
   /**
-   * Get the metered status of network.
+   * Get the metered status of Drive connection.
    *
    * @return {boolean} Returns true if drive should limit the traffic because
    * the connection is metered and the 'disable-sync-on-metered' setting is
    * enabled. Otherwise, returns false.
    */
   FileManager.prototype.isDriveOnMeteredConnection = function() {
-    return this.networkState_.type == DriveConnectionType.METERED;
+    return this.driveConnectionState_.type == DriveConnectionType.METERED;
   };
 
   /**
    * Get the online/offline status of drive.
    *
    * @return {boolean} Returns true if the connection is offline. Otherwise,
    * returns false.
    */
   FileManager.prototype.isDriveOffline = function() {
-    return this.networkState_.type == DriveConnectionType.OFFLINE;
+    return this.driveConnectionState_.type == DriveConnectionType.OFFLINE;
   };
 
   FileManager.prototype.isDriveEnabled = function() {
     return !this.params_.disableDrive &&
         (!('driveEnabled' in this.preferences_) ||
          this.preferences_.driveEnabled);
   };
 
   FileManager.prototype.isOnReadonlyDirectory = function() {
     return this.directoryModel_.isReadOnly();
@@ skipping 1188 matching lines @@
     return this.directoryModel_.getFileList();
   };
 
   /**
    * @return {cr.ui.List} Current list object.
    */
   FileManager.prototype.getCurrentList = function() {
     return this.currentList_;
   };
 })();