Drive: Rename GData to Drive in extension JS API

chrome/browser/resources/file_manager/js/volume_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.
 
 /**
  * VolumeManager is responsible for tracking list of mounted volumes.
  *
  * @constructor
  * @extends {cr.EventTarget}
  */
@@ skipping 43 matching lines @@
  * @enum
  */
 VolumeManager.GDataStatus = {
   UNMOUNTED: 'unmounted',
   MOUNTING: 'mounting',
   ERROR: 'error',
   MOUNTED: 'mounted'
 };
 
 /**
+ * @enum
+ */
+VolumeManager.MountType = {
+  DEVICE: 'device',
+  FILE: 'file',
+  NETWORK: 'network',
+  DRIVE: 'drive'
+};

[satorux1, 2012/11/26 05:50:40]

Looks like a good cleanup, but I think we should do cleanup like this in a
separate patch.

[yoshiki, 2012/11/26 06:07:22]

Got it, I'll do that at another CL.

+
+/**
  * Time in milliseconds that we wait a respone for. If no response on
  * mount/unmount received the request supposed failed.
  */
 VolumeManager.TIMEOUT = 15 * 60 * 1000;
 
 /**
  * Delay in milliseconds GDATA changes its state from |UNMOUNTED| to
  * |MOUNTING|. Used to display progress in the UI.
  */
 VolumeManager.MOUNTING_DELAY = 500;
@@ skipping 38 matching lines @@
  * @private
  */
 VolumeManager.prototype.initMountPoints_ = function() {
   var mountedVolumes = [];
   var self = this;
   var index = 0;
   this.deferredQueue_ = [];
   function step(mountPoints) {
     if (index < mountPoints.length) {
       var info = mountPoints[index];
-      if (info.mountType == 'gdata')
+      if (info.mountType == VolumeManager.MountType.DRIVE)
         console.error('GData is not expected initially mounted');
       var error = info.mountCondition ? 'error_' + info.mountCondition : '';
       function onVolumeInfo(volume) {
         mountedVolumes.push(volume);
         index++;
         step(mountPoints);
       }
       self.makeVolumeInfo_('/' + info.mountPath, error, onVolumeInfo);
     } else {
       for (var i = 0; i < mountedVolumes.length; i++) {
@@ skipping 57 matching lines @@
       this.dispatchEvent(e);
     }
     this.finishRequest_(requestKey, status);
 
     if (event.status == 'success') {
       delete this.mountedVolumes_[mountPath];
       cr.dispatchSimpleEvent(this, 'change');
     }
   }
 
-  if (event.mountType == 'gdata') {
+  if (event.mountType == VolumeManager.MountType.DRIVE) {
     if (event.status == 'success') {
       if (event.eventType == 'mount') {
         // If the mount is not requested, the mount status will not be changed
         // at mountGData(). Sets it here in such a case.
         var self = this;
         var timeout = setTimeout(function() {
           if (self.getGDataStatus() == VolumeManager.GDataStatus.UNMOUNTED)
             self.setGDataStatus_(VolumeManager.GDataStatus.MOUNTING);
           timeout = null;
         }, VolumeManager.MOUNTING_DELAY);
@@ skipping 72 matching lines @@
 
 /**
  * @param {Function} successCallback Success callback.
  * @param {Function} errorCallback Error callback.
  */
 VolumeManager.prototype.mountGData = function(successCallback, errorCallback) {
   if (this.getGDataStatus() == VolumeManager.GDataStatus.ERROR) {
     this.setGDataStatus_(VolumeManager.GDataStatus.UNMOUNTED);
   }
   var self = this;
-  this.mount_('', 'gdata', function(mountPath) {
+  this.mount_('', VolumeManager.MountType.DRIVE, function(mountPath) {
     this.waitGDataLoaded_(mountPath, function(success, error) {
       if (success) {
         successCallback(mountPath);
       } else {
         errorCallback(error);
       }
     });
   }, function(error) {
     if (self.getGDataStatus() != VolumeManager.GDataStatus.MOUNTED)
       self.setGDataStatus_(VolumeManager.GDataStatus.ERROR);
     errorCallback(error);
   });
 };
 
 /**
  * @param {string} fileUrl File url to the archive file.
  * @param {Function} successCallback Success callback.
  * @param {Function} errorCallback Error callback.
  */
 VolumeManager.prototype.mountArchive = function(fileUrl, successCallback,
                                                 errorCallback) {
-  this.mount_(fileUrl, 'file', successCallback, errorCallback);
+  this.mount_(fileUrl,
+              VolumeManager.MountType.FILE,
+              successCallback,
+              errorCallback);
 };
 
 /**
  * Unmounts volume.
  * @param {string} mountPath Volume mounted path.
  * @param {Function} successCallback Success callback.
  * @param {Function} errorCallback Error callback.
  */
 VolumeManager.prototype.unmount = function(mountPath,
                                            successCallback,
@@ skipping 174 matching lines @@
 };
 
 /**
  * @param {string} mountPath Mount path.
  * @private
  */
 VolumeManager.prototype.validateMountPath_ = function(mountPath) {
   if (!/^\/(((archive|removable)\/[^\/]+)|drive|Downloads)$/.test(mountPath))
     throw new Error('Invalid mount path: ', mountPath);
 };