Revert 133691 because it accidentally reverted revs 133686 and 133684.

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

Index: chrome/browser/resources/file_manager/js/file_manager.js
===================================================================
--- chrome/browser/resources/file_manager/js/file_manager.js	(revision 133697)
+++ chrome/browser/resources/file_manager/js/file_manager.js	(working copy)
@@ -507,7 +507,7 @@
         'modificationTime';
     var sortDirection =
         window.localStorage['sort-direction-' + this.dialogType_] || 'desc';
-    this.directoryModel_.fileList.sort(sortField, sortDirection);
+    this.directoryModel_.sortFileList(sortField, sortDirection);
 
     this.refocus();
 
@@ -519,7 +519,7 @@
        return self.getMetadataProvider().isInitialized();
     });
 
-    this.directoryModel_.offline = this.isOffline();
+    this.directoryModel_.setOffline(this.isOffline());
 
     if (this.dialogType_ == FileManager.DialogType.FULL_PAGE)
       this.initDataTransferOperations_();
@@ -539,8 +539,8 @@
         this.onCopyManagerOperationComplete_.bind(this));
 
     var controller = this.fileTransferController_ = new FileTransferController(
-        this.directoryModel_.fileList,
-        this.directoryModel_.fileListSelection,
+        this.directoryModel_.getFileList(),
+        this.directoryModel_.getFileListSelection(),
         GridItem.bind(null, this),
         this.copyManager_,
         this.directoryModel_);
@@ -721,7 +721,7 @@
         str('ENABLE_GDATA') == '1',
         this.metadataCache_);
 
-    var dataModel = this.directoryModel_.fileList;
+    var dataModel = this.directoryModel_.getFileList();
     var collator = this.collator_;
     // TODO(dgozman): refactor comparison functions together with
     // render/update/display.
@@ -740,12 +740,9 @@
     dataModel.addEventListener('permuted',
                                this.onDataModelPermuted_.bind(this));
 
-    this.directoryModel_.fileListSelection.addEventListener(
+    this.directoryModel_.getFileListSelection().addEventListener(
         'change', this.onSelectionChanged_.bind(this));
 
-    this.directoryModel_.autoSelectIndex =
-        this.dialogType_ == FileManager.DialogType.SELECT_SAVEAS_FILE ? -1 : 0;
-
     this.initTable_();
     this.initGrid_();
     this.initRootsList_();
@@ -885,7 +882,7 @@
   };
 
   FileManager.prototype.onDataModelPermuted_ = function(event) {
-    var sortStatus = this.directoryModel_.fileList.sortStatus;
+    var sortStatus = this.directoryModel_.getFileList().sortStatus;
     window.localStorage['sort-field-' + this.dialogType_] = sortStatus.field;
     window.localStorage['sort-direction-' + this.dialogType_] =
         sortStatus.direction;
@@ -1157,8 +1154,8 @@
     // style and only then set dataModel.
 
     if (type == FileManager.ListType.DETAIL) {
-      this.table_.dataModel = this.directoryModel_.fileList;
-      this.table_.selectionModel = this.directoryModel_.fileListSelection;
+      this.table_.dataModel = this.directoryModel_.getFileList();
+      this.table_.selectionModel = this.directoryModel_.getFileListSelection();
       this.table_.style.display = '';
       this.grid_.style.display = 'none';
       this.grid_.selectionModel = this.emptySelectionModel_;
@@ -1171,8 +1168,8 @@
       this.dialogDom_.querySelector('div.thumbnail-view')
           .removeAttribute('disabled');
     } else if (type == FileManager.ListType.THUMBNAIL) {
-      this.grid_.dataModel = this.directoryModel_.fileList;
-      this.grid_.selectionModel = this.directoryModel_.fileListSelection;
+      this.grid_.dataModel = this.directoryModel_.getFileList();
+      this.grid_.selectionModel = this.directoryModel_.getFileListSelection();
       this.grid_.style.display = '';
       this.table_.style.display = 'none';
       this.table_.selectionModel = this.emptySelectionModel_;
@@ -1355,7 +1352,7 @@
    * update event).
    */
   FileManager.prototype.onCopyManagerOperationComplete_ = function(event) {
-    var currentPath = this.directoryModel_.currentEntry.fullPath;
+    var currentPath = this.directoryModel_.getCurrentDirEntry().fullPath;
     function inCurrentDirectory(entry) {
       var fullPath = entry.fullPath;
       var dirPath = fullPath.substr(0, fullPath.length -
@@ -1429,7 +1426,7 @@
     // Nothing left to do if the current directory is not changing. This happens
     // if we are exiting the Gallery.
     if (this.getPathFromUrlOrParams_() ==
-        this.directoryModel_.currentEntry.fullPath)
+        this.directoryModel_.getCurrentDirEntry().fullPath)
       return;
     this.setupCurrentDirectory_(true /* invokeHandler */);
   };
@@ -1679,7 +1676,7 @@
    * Update check and disable states of the 'Select all' checkbox.
    */
   FileManager.prototype.updateSelectAllCheckboxState_ = function(checkbox) {
-    var dm = this.directoryModel_.fileList;
+    var dm = this.directoryModel_.getFileList();
     checkbox.checked = this.selection && dm.length > 0 &&
                        dm.length == this.selection.totalCount;
     checkbox.disabled = dm.length == 0;
@@ -1946,8 +1943,9 @@
     var fileName = this.document_.createElement('div');
     fileName.className = 'filename-label';
 
-    fileName.textContent = this.directoryModel_.currentEntry.name == '' ?
-        this.getRootLabel_(entry.name) : entry.name;
+    fileName.textContent =
+        this.directoryModel_.getCurrentDirEntry().name == '' ?
+            this.getRootLabel_(entry.name) : entry.name;
     return fileName;
   };
 
@@ -2041,7 +2039,7 @@
 
   FileManager.prototype.displayDateInDiv_ = function(div, filesystemProps) {
     if (!filesystemProps) return;
-    if (this.directoryModel_.isSystemDirectoy &&
+    if (this.directoryModel_.isSystemDirectory() &&
         filesystemProps.modificationTime.getTime() == 0) {
       // Mount points for FAT volumes have this time associated with them.
       // We'd rather display nothing than this bogus date.
@@ -2077,7 +2075,7 @@
   };
 
   FileManager.prototype.refreshCurrentDirectoryMetadata_ = function() {
-    var entries = this.directoryModel_.fileList.slice();
+    var entries = this.directoryModel_.getFileList().slice();
     this.metadataCache_.clear(entries, 'filesystem');
     // We don't pass callback here. When new metadata arrives, we have an
     // observer registered to update the UI.
@@ -2089,7 +2087,7 @@
     if (this.listType_ != FileManager.ListType.DETAIL) return;
 
     var items = {};
-    var dm = this.directoryModel_.fileList;
+    var dm = this.directoryModel_.getFileList();
     for (var index = 0; index < dm.length; index++) {
       var listItem = this.currentList_.getListItemByIndex(index);
       if (!listItem) continue;
@@ -2121,11 +2119,11 @@
       return;
 
     var dm = this.directoryModel_;
-    var leadIndex = dm.fileListSelection.leadIndex;
+    var leadIndex = dm.getFileListSelection().leadIndex;
     if (leadIndex < 0)
       return;
 
-    var leadEntry = dm.fileList.item(leadIndex);
+    var leadEntry = dm.getFileList().item(leadIndex);
     if (this.renameInput_.currentEntry.fullPath != leadEntry.fullPath)
       return;
 
@@ -2194,7 +2192,7 @@
     }
 
     for (var i = 0; i < selection.indexes.length; i++) {
-      var entry = this.directoryModel_.fileList.item(selection.indexes[i]);
+      var entry = this.directoryModel_.getFileList().item(selection.indexes[i]);
       if (!entry)
         continue;
 
@@ -2614,7 +2612,7 @@
       console.log('ONLINE');
       this.dialogContainer_.removeAttribute('offline');
     }
-    this.directoryModel_.offline = this.isOffline();
+    this.directoryModel_.setOffline(this.isOffline());
   };
 
   FileManager.prototype.isOnGDataOffline = function() {
@@ -2622,7 +2620,7 @@
   };
 
   FileManager.prototype.isOnReadonlyDirectory = function() {
-    return this.directoryModel_.readonly;
+    return this.directoryModel_.isReadOnly();
   };
 
   /**
@@ -2651,7 +2649,7 @@
         if (this.setupCurrentDirectoryPostponed_) {
           this.setupCurrentDirectoryPostponed_(false /* execute */);
         } else if (this.isOnGData() &&
-                   this.directoryModel_.currentEntry.unmounted) {
+                   this.directoryModel_.getCurrentDirEntry().unmounted) {
           // We are currently on an unmounted GData directory, force a rescan.
           changeDirectoryTo = this.directoryModel_.getCurrentRootPath();
         }
@@ -2791,9 +2789,9 @@
 
   FileManager.prototype.getAllUrlsInCurrentDirectory_ = function() {
     var urls = [];
-    var dm = this.directoryModel_.fileList;
-    for (var i = 0; i != dm.length; i++) {
-      urls.push(dm.item(i).toURL());
+    var fileList = this.directoryModel_.getFileList();
+    for (var i = 0; i != fileList.length; i++) {
+      urls.push(fileList.item(i).toURL());
     }
     return urls;
   };
@@ -2837,7 +2835,7 @@
       selectedUrl = urls[0];
     }
 
-    var dirPath = this.directoryModel_.currentEntry.fullPath;
+    var dirPath = this.directoryModel_.getCurrentDirEntry().fullPath;
 
     // Push a temporary state which will be replaced every time an individual
     // item is selected in the Gallery.
@@ -2851,7 +2849,7 @@
       // Gallery shoud treat GData folder as readonly even when online
       // until we learn to save files directly to GData.
       var readonly = self.isOnReadonlyDirectory() || self.isOnGData();
-      var currentDir = self.directoryModel_.currentEntry;
+      var currentDir = self.directoryModel_.getCurrentDirEntry();
       var downloadsDir = self.directoryModel_.getRootsList().item(0);
 
       var gallerySelection;
@@ -2861,7 +2859,7 @@
             readonly ?
                 (self.isOnGData() ?
                     self.getRootLabel_(currentDir.fullPath) :
-                    self.directoryModel_.rootName) :
+                    self.directoryModel_.getRootName()) :
                 null,
         saveDirEntry: readonly ? downloadsDir : currentDir,
         metadataProvider: self.getMetadataProvider(),
@@ -2892,7 +2890,7 @@
     removeChildren(bc);
 
     var rootPath = this.directoryModel_.getCurrentRootPath();
-    var relativePath = this.directoryModel_.currentEntry.fullPath.
+    var relativePath = this.directoryModel_.getCurrentDirEntry().fullPath.
                        substring(rootPath.length).replace(/\/$/, '');
 
     var pathNames = relativePath.replace(/\/$/, '').split('/');
@@ -3066,7 +3064,7 @@
    */
   FileManager.prototype.getCurrentDirectory = function() {
     return this.directoryModel_ &&
-        this.directoryModel_.currentEntry.fullPath;
+        this.directoryModel_.getCurrentDirEntry().fullPath;
   };
 
   /**
@@ -3074,7 +3072,7 @@
    */
   FileManager.prototype.getCurrentDirectoryURL = function() {
     return this.directoryModel_ &&
-        this.directoryModel_.currentEntry.toURL();
+        this.directoryModel_.getCurrentDirEntry().toURL();
   };
 
   FileManager.prototype.deleteEntries = function(entries, force, opt_callback) {
@@ -3170,7 +3168,7 @@
   };
 
   FileManager.prototype.onCheckboxClick_ = function(event) {
-    var sm = this.directoryModel_.fileListSelection;
+    var sm = this.directoryModel_.getFileListSelection();
     var listItem = this.findListItemForEvent_(event);
     sm.setIndexSelected(listItem.listIndex, event.target.checked);
   };
@@ -3440,7 +3438,7 @@
       this.metadataCache_.removeObserver(this.metadataObserverId_);
 
     this.metadataObserverId_ = this.metadataCache_.addObserver(
-        this.directoryModel_.currentEntry,
+        this.directoryModel_.getCurrentDirEntry(),
         MetadataCache.CHILDREN,
         'filesystem',
         this.updateFilesystemPropertiesInUI_.bind(this));
@@ -3676,7 +3674,7 @@
     var defaultName = str('DEFAULT_NEW_FOLDER_NAME');
 
     // Find a name that doesn't exist in the data model.
-    var files = this.directoryModel_.fileList;
+    var files = this.directoryModel_.getFileList();
     var hash = {};
     for (var i = 0; i < files.length; i++) {
       var name = files.item(i).name;
@@ -3749,7 +3747,7 @@
     switch (util.getKeyModifiers(event) + event.keyCode) {
       case 'Ctrl-190':  // Ctrl-. => Toggle filter files.
         var dm = this.directoryModel_;
-        dm.filterHidden = !dm.filterHidden;
+        dm.setFilterHidden(!dm.getFilterHidden());
         event.preventDefault();
         return;
 
@@ -3903,7 +3901,7 @@
     if (!text)
       return;
 
-    var dm = this.directoryModel_.fileList;
+    var dm = this.directoryModel_.getFileList();
     for (var index = 0; index < dm.length; ++index) {
       var name = dm.item(index).name;
       if (name.substring(0, text.length).toLowerCase() == text) {
@@ -4144,7 +4142,7 @@
     if (!selectedIndexes.length)
       throw new Error('Nothing selected!');
 
-    var dm = this.directoryModel_.fileList;
+    var dm = this.directoryModel_.getFileList();
     for (var i = 0; i < selectedIndexes.length; i++) {
       var entry = dm.item(selectedIndexes[i]);
       if (!entry) {
@@ -4210,7 +4208,7 @@
       msg = str('ERROR_WHITESPACE_NAME');
     } else if (/^(CON|PRN|AUX|NUL|COM[1-9]|LPT[1-9])$/i.test(name)) {
       msg = str('ERROR_RESERVED_NAME');
-    } else if (this.directoryModel_.filterHidden && name[0] == '.') {
+    } else if (this.directoryModel_.getFilterHidden() && name[0] == '.') {
       msg = str('ERROR_HIDDEN_NAME');
     }
 
Property changes on: chrome/browser/resources/file_manager/js/file_manager.js
___________________________________________________________________
Added: svn:mergeinfo