Merge 82577 - FileManager: assorted fixes* Switch webkitRequestFileSystem/webkitResolveLocalFileS...

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

 // Copyright (c) 2011 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.
 
 // TODO(rginda): Remove this and related code after zel's file scheme fix lands.
 const ENABLE_EXIF_READER = false;
 
 // TODO(rginda): Remove this when the thumbnail view is less janky.
 const ENABLE_THUMBNAIL_VIEW = false;
 
@@ skipping 441 matching lines @@
 
     this.dataModel_ = new cr.ui.table.TableDataModel([]);
     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.selectionModel_ = new cr.ui.table.TableSingleSelectionModel();
+      this.selectionModelClass_ = cr.ui.table.TableSingleSelectionModel;
     } else {
-      this.selectionModel_ = new cr.ui.table.TableSelectionModel();
+      this.selectionModelClass_ = cr.ui.table.TableSelectionModel;
     }
 
     this.initTable_();
     this.initGrid_();
 
     this.setListType(FileManager.ListType.DETAIL);
 
     this.onResize_();
     this.dialogDom_.style.opacity = '1';
   };
@@ skipping 24 matching lines @@
     this.currentList_.redraw();
   };
 
   /**
    * Initialize the file thumbnail grid.
    */
   FileManager.prototype.initGrid_ = function() {
     this.grid_ = this.dialogDom_.querySelector('.thumbnail-grid');
     cr.ui.Grid.decorate(this.grid_);
     this.grid_.dataModel = this.dataModel_;
-    this.grid_.selectionModel = this.selectionModel_;
+    this.grid_.selectionModel = new this.selectionModelClass_();
 
     var self = this;
     this.grid_.itemConstructor = function(entry) {
       return self.renderThumbnail_(entry);
     };
 
     this.grid_.addEventListener(
         'dblclick', this.onDetailDoubleClick_.bind(this));
     this.grid_.selectionModel.addEventListener(
         'change', this.onDetailSelectionChanged_.bind(this));
@@ skipping 14 matching lines @@
 
     columns[0].renderFunction = this.renderIconType_.bind(this);
     columns[1].renderFunction = this.renderName_.bind(this);
     columns[2].renderFunction = this.renderSize_.bind(this);
     columns[3].renderFunction = this.renderDate_.bind(this);
 
     this.table_ = this.dialogDom_.querySelector('.detail-table');
     cr.ui.Table.decorate(this.table_);
 
     this.table_.dataModel = this.dataModel_;
-    this.table_.selectionModel = this.selectionModel_;
+    this.table_.selectionModel = new this.selectionModelClass_();
     this.table_.columnModel = new cr.ui.table.TableColumnModel(columns);
 
     this.table_.addEventListener(
         'dblclick', this.onDetailDoubleClick_.bind(this));
     this.table_.selectionModel.addEventListener(
         'change', this.onDetailSelectionChanged_.bind(this));
   };
 
   FileManager.prototype.onResize_ = function() {
     this.table_.style.height = this.grid_.style.height =
@@ skipping 77 matching lines @@
 
       default:
         throw new Error('Unknown dialog type: ' + this.dialogType_);
     }
 
     this.okButton_.textContent = okLabel;
 
     dialogTitle = this.params_.title || defaultTitle;
     this.dialogDom_.querySelector('.dialog-title').textContent = dialogTitle;
 
-    ary = defaultFolder.match(/^\/home\/[^\/]+\/Downloads(\/.*)?$/);
+    ary = defaultFolder.match(/^\/home\/[^\/]+\/user\/Downloads(\/.*)?$/);
     if (ary) {
         // Chrome will probably suggest the full path to Downloads, but
         // we're working with 'virtual paths', so we have to translate.
         // TODO(rginda): Maybe chrome should have suggested the correct place
         // to begin with, but that would mean it would have to treat the
         // file manager dialogs differently than the native ones.
         defaultFolder = '/Downloads' + (ary[1] || '');
       }
 
     this.changeDirectory(defaultFolder);
@@ skipping 456 matching lines @@
     }
 
     if (ENABLE_EXIF_READER) {
       if (entry.name.match(/\.jpe?g$/i)) {
         // File is a jpg image, fetch the exif thumbnail.
         this.cacheExifMetadata_(entry, function(metadata) {
           callback(iconType, metadata.thumbnailURL || entry.toURL());
         });
         return;
       }
-
-      // File is some other kind of image, just return the url to the whole
-      // thing.
-      setTimeout(function() { callback(iconType, entry.toURL()) });
-      return;
     }
 
-    // If the exif reader worker isn't enabled, read the entire file as a
-    // data url instead.
-    batchAsyncCall(entry, 'file', function(file) {
-      var reader = new FileReader();
-
-      reader.onerror = util.ferr('Error reading preview: ' + entry.fullPath);
-      reader.onloadend = function(e) { callback(iconType, reader.result) };
-      reader.readAsDataURL(file);
-    });
+    // File is some other kind of image, just return the url to the whole
+    // thing.
+    setTimeout(function() { callback(iconType, entry.toURL()) });
   };
 
   /**
    * Change the current directory.
    *
    * Dispatches the 'directory-changed' event when the directory is successfully
    * changed.
    *
    * @param {string} path The absolute path to the new directory.
    */
@@ skipping 383 matching lines @@
     } else if (this.dialogType_ == FileManager.DialogType.SELECT_OPEN_FILE) {
       if (!this.selection.leadEntry.isFile)
         throw new Error('Selected entry is not a file!');
     }
 
     chrome.fileBrowserPrivate.selectFile(ary[0], 0);
     window.close();
   };
 
 })();