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

chrome/browser/resources/file_manager/js/file_manager.js

Index: chrome/browser/resources/file_manager/js/file_manager.js
diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js
index 3c517ef56be058fb2a20d98edd7e2ab3c17ded1e..f370c86e0197f19be9bb6046a92980ddea9d9499 100644
--- a/chrome/browser/resources/file_manager/js/file_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_manager.js
@@ -128,6 +128,7 @@ var DriveConnectionType = {
 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.

 };
 
 /**
@@ -1685,8 +1686,8 @@ DialogType.isModal = function(type) {
       done();
     });
 
-    chrome.fileBrowserPrivate.getDriveConnectionState(function(networkState) {
-      self.networkState_ = networkState;
+    chrome.fileBrowserPrivate.getDriveConnectionState(function(state) {
+      self.driveConnectionState_ = state;
       done();
     });
   };
@@ -1695,13 +1696,13 @@ DialogType.isModal = function(type) {
     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', '');
@@ -1718,7 +1719,7 @@ DialogType.isModal = function(type) {
       else
         self.hostedButton.removeAttribute('checked');
 
-      switch (network.type) {
+      switch (connection.type) {
         case DriveConnectionType.ONLINE:
           self.dialogContainer_.removeAttribute('connection');
           break;
@@ -1735,14 +1736,14 @@ DialogType.isModal = function(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;
   };
 
   /**
@@ -1752,7 +1753,7 @@ DialogType.isModal = function(type) {
    * returns false.
    */
   FileManager.prototype.isDriveOffline = function() {
-    return this.networkState_.type == DriveConnectionType.OFFLINE;
+    return this.driveConnectionState_.type == DriveConnectionType.OFFLINE;
   };
 
   FileManager.prototype.isDriveEnabled = function() {