Move sorting logic from table to list.

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 58f073b438f73afce8ad6d815d8c15475e59ac37..b96ecd91640e434e5c6181cbc809e5c3ad844952 100644
--- a/chrome/browser/resources/file_manager/js/file_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_manager.js
@@ -518,20 +518,18 @@ FileManager.prototype = {
     // Always sharing the data model between the detail/thumb views confuses
     // them.  Instead we maintain this bogus data model, and hook it up to the
     // view that is not in use.
-    this.emptyDataModel_ = new cr.ui.table.TableDataModel([]);
+    this.emptyDataModel_ = new cr.ui.ArrayDataModel([]);
 
-    this.dataModel_ = new cr.ui.table.TableDataModel([]);
+    this.dataModel_ = new cr.ui.ArrayDataModel([]);
     this.dataModel_.sort('name');
-    this.dataModel_.addEventListener('sorted',
-                                this.onDataModelSorted_.bind(this));
     this.dataModel_.prepareSort = this.prepareSort_.bind(this);
 
     if (this.dialogType_ == FileManager.DialogType.SELECT_OPEN_FILE ||
         this.dialogType_ == FileManager.DialogType.SELECT_OPEN_FOLDER ||
         this.dialogType_ == FileManager.DialogType.SELECT_SAVEAS_FILE) {
-      this.selectionModelClass_ = cr.ui.table.TableSingleSelectionModel;
+      this.selectionModelClass_ = cr.ui.ListSingleSelectionModel;
     } else {
-      this.selectionModelClass_ = cr.ui.table.TableSelectionModel;
+      this.selectionModelClass_ = cr.ui.ListSelectionModel;
     }
 
     this.initTable_();
@@ -1426,16 +1424,6 @@ FileManager.prototype = {
   };
 
   /**
-   * Invoked by the table dataModel after a sort completes.
-   *
-   * We use this hook to make sure selected files stay visible after a sort.
-   */
-  FileManager.prototype.onDataModelSorted_ = function() {
-    var i = this.currentList_.selectionModel.leadIndex;
-    this.currentList_.scrollIntoView(i);
-  }
-
-  /**
    * Update the selection summary UI when the selection summarization completes.
    */
   FileManager.prototype.onSelectionSummarized_ = function() {
@@ -1568,9 +1556,6 @@ FileManager.prototype = {
 
     function onReadSome(entries) {
       if (entries.length == 0) {
-        if (self.dataModel_.sortStatus.field != 'name')
-          self.dataModel_.updateIndex(0);
-
         if (opt_callback)
           opt_callback();
         return;
@@ -1616,7 +1601,6 @@ FileManager.prototype = {
     var spliceArgs = [].slice.call(this.rootEntries_);
     spliceArgs.unshift(0, 0);  // index, deleteCount
     self.dataModel_.splice.apply(self.dataModel_, spliceArgs);
-    self.dataModel_.updateIndex(0);
 
     if (opt_callback)
       opt_callback();