Sort by type now sorts by localized string representation of file type.

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.
 
 /**
  * FileManager constructor.
  *
  * FileManager objects encapsulate the functionality of the file selector
  * dialogs, as well as the full screen file manager application (though the
  * latter is not yet implemented).
@@ skipping 857 matching lines @@
     var bSize = bCachedFilesystem ? bCachedFilesystem.size : 0;
 
     if (aSize != bSize) return aSize - bSize;
     return this.collator_.compare(a.name, b.name);
   };
 
   /**
    * Compare by type first, then by subtype and then by name.
    */
   FileManager.prototype.compareType_ = function(a, b) {
-    var aType = FileType.getType(a);
-    var bType = FileType.getType(b);
+    // Directories precede files.
+    if (a.isDirectory != b.isDirectory)
+      return Number(b.isDirectory) - Number(a.isDirectory);
 
+    var aType = this.getFileTypeString_(a);
+    var bType = this.getFileTypeString_(b);
 
-    // Files of unknown type follows all the others.
-    var result = this.collator_.compare(aType.type || 'Z',
-                                        bType.type || 'Z');
+    var result = this.collator_.compare(aType, bType);
     if (result != 0)
       return result;
 
-    // If types are same both subtypes are defined of both are undefined.
-    result = this.collator_.compare(aType.subtype || '',
-                                    bType.subtype || '');
-    if (result != 0)
-      return result;
-
     return this.collator_.compare(a.name, b.name);
   };
 
   FileManager.prototype.refocus = function() {
     if (this.dialogType_ == FileManager.DialogType.SELECT_SAVEAS_FILE)
       this.filenameInput_.focus();
     else
       this.currentList_.focus();
   };
 
@@ skipping 1080 matching lines @@
   /**
    * Render the Type column of the detail table.
    *
    * @param {Entry} entry The Entry object to render.
    * @param {string} columnId The id of the column to be rendered.
    * @param {cr.ui.Table} table The table doing the rendering.
    */
   FileManager.prototype.renderType_ = function(entry, columnId, table) {
     var div = this.document_.createElement('div');
     div.className = 'type';
-    var fileType = FileType.getType(entry);
-    if (fileType.subtype)
-      div.textContent = strf(fileType.name, fileType.subtype);
-    else
-      div.textContent = str(fileType.name);
+    div.textContent = this.getFileTypeString_(entry);
     return div;
   };
 
   /**
+   * @param {Entry} entry File or directory entry.
+   * @return {string} Localized string representation of file type.
+   */
+  FileManager.prototype.getFileTypeString_ = function(entry) {
+    var fileType = FileType.getType(entry);
+    if (fileType.subtype)
+      return strf(fileType.name, fileType.subtype);
+    else
+      return str(fileType.name);
+  };
+
+  /**
    * Render the Date column of the detail table.
    *
    * @param {Entry} entry The Entry object to render.
    * @param {string} columnId The id of the column to be rendered.
    * @param {cr.ui.Table} table The table doing the rendering.
    */
   FileManager.prototype.renderDate_ = function(entry, columnId, table) {
     var div = this.document_.createElement('div');
     div.className = 'date';
 
@@ skipping 2740 matching lines @@
 
     function closeBanner() {
       self.cleanupGDataWelcome_();
       // Stop showing the welcome banner.
       localStorage[WELCOME_HEADER_COUNTER_KEY] = WELCOME_HEADER_COUNTER_LIMIT;
     }
 
     return maybeShowBanner;
   };
 })();