FileManager: assorted fixes

* Switch webkitRequestFileSystem/webkitResolveLocalFileSystemURL.
* Stop sharing selection models between grid/table, it doesn't work.
* Remove readAsDataURL in favor of toURL
* Fix case where chrome sets defaultPath to the downloads folder.

BUG=
TEST=

Review URL: http://codereview.chromium.org/6899003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82577 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 17 insertions, 28 deletions

diff --git a/chrome/browser/resources/file_manager/js/exif_reader.js b/chrome/browser/resources/file_manager/js/exif_reader.js
index bf18a8c..c7c43d1 100644
--- a/chrome/browser/resources/file_manager/js/exif_reader.js
+++ b/chrome/browser/resources/file_manager/js/exif_reader.js
@@ -38,9 +38,9 @@ var exif = {
     var steps =
     [ // Step one, turn the url into an entry.
       function getEntry() {
-        resolveLocalFileSystemURL(fileURL,
-                                  function(entry) { nextStep(entry) },
-                                  onError);
+        webkitResolveLocalFileSystemURL(fileURL,
+                                        function(entry) { nextStep(entry) },
+                                        onError);
       },
 
       // Step two, turn the entry into a file.
diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js
index bab35813..1ac96ad 100644
--- a/chrome/browser/resources/file_manager/js/file_manager.js
+++ b/chrome/browser/resources/file_manager/js/file_manager.js
@@ -459,9 +459,9 @@ FileManager.prototype = {
     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_();
@@ -506,7 +506,7 @@ FileManager.prototype = {
     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) {
@@ -541,7 +541,7 @@ FileManager.prototype = {
     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(
@@ -639,7 +639,7 @@ FileManager.prototype = {
     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.
@@ -1117,22 +1117,11 @@ FileManager.prototype = {
         });
         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()) });
   };
 
   /**
diff --git a/chrome/browser/resources/file_manager/js/harness.js b/chrome/browser/resources/file_manager/js/harness.js
index 3b2b61a..cbffbcd 100644
--- a/chrome/browser/resources/file_manager/js/harness.js
+++ b/chrome/browser/resources/file_manager/js/harness.js
@@ -20,9 +20,9 @@ var harness = {
       self.filesystem = filesystem;
     };
 
-    window.requestFileSystem(window.PERSISTENT, 16 * 1024 * 1024,
-                             onFilesystem,
-                             util.flog('Error initializing filesystem'));
+    window.webkitRequestFileSystem(window.PERSISTENT, 16 * 1024 * 1024,
+                                   onFilesystem,
+                                   util.flog('Error initializing filesystem'));
 
     var paramstr = decodeURIComponent(document.location.search.substr(1));
     this.params = paramstr ? JSON.parse(paramstr) : {};
diff --git a/chrome/browser/resources/file_manager/js/mock_chrome.js b/chrome/browser/resources/file_manager/js/mock_chrome.js
index 7a2b399..3fd9806 100644
--- a/chrome/browser/resources/file_manager/js/mock_chrome.js
+++ b/chrome/browser/resources/file_manager/js/mock_chrome.js
@@ -15,9 +15,9 @@ chrome.fileBrowserPrivate = {
    * --unlimited-quota-for-files in order for this to work.
    */
   requestLocalFileSystem: function(callback) {
-    window.requestFileSystem(window.PERSISTENT, 16 * 1024 * 1024,
-                             callback,
-                             util.ferr('Error requesting filesystem'));
+    window.webkitRequestFileSystem(window.PERSISTENT, 16 * 1024 * 1024,
+                                   callback,
+                                   util.ferr('Error requesting filesystem'));
   },
 
   /**