Fix open dialog not remembering last opened folder on drive

chrome/browser/file_select_helper.cc

 // 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.
 
 #include "chrome/browser/file_select_helper.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/file_util.h"
@@ skipping 49 matching lines @@
       base::PLATFORM_FILE_WRITE |
       base::PLATFORM_FILE_WRITE_ATTRIBUTES |
       base::PLATFORM_FILE_ASYNC;
 
   int permissions = kReadFilePermissions;
   if (dialog_type == SelectFileDialog::SELECT_SAVEAS_FILE)
     permissions = kWriteFilePermissions;
   render_view_host->FilesSelectedInChooser(files, permissions);
 }
 
-// Converts a list of FilePaths to a list of SelectedFileInfo, with the
-// display name field left empty.
-std::vector<ui::SelectedFileInfo> ConvertToSelectedFileInfoList(
+// Converts a list of FilePaths to a list of ui::SelectedFileInfo.
+std::vector<ui::SelectedFileInfo> FilePathListToSelectedFileInfoList(
     const std::vector<FilePath>& paths) {
   std::vector<ui::SelectedFileInfo> selected_files;
   for (size_t i = 0; i < paths.size(); ++i) {
     selected_files.push_back(
-        ui::SelectedFileInfo(paths[i], FilePath::StringType()));
+        ui::SelectedFileInfo(paths[i], paths[i]));
   }
   return selected_files;
 }
 
 }  // namespace
 
 struct FileSelectHelper::ActiveDirectoryEnumeration {
   ActiveDirectoryEnumeration() : rvh_(NULL) {}
 
   scoped_ptr<DirectoryListerDispatchDelegate> delegate_;
@@ skipping 23 matching lines @@
   for (iter = directory_enumerations_.begin();
        iter != directory_enumerations_.end();
        ++iter) {
     iter->second->lister_.reset();
     delete iter->second;
   }
 }
 
 void FileSelectHelper::FileSelected(const FilePath& path,
                                     int index, void* params) {
-  FileSelectedWithExtraInfo(
-      ui::SelectedFileInfo(path, FilePath::StringType()),
-      index, params);
+  FileSelectedWithExtraInfo(ui::SelectedFileInfo(path, path), index, params);
 }
 
 void FileSelectHelper::FileSelectedWithExtraInfo(
     const ui::SelectedFileInfo& file,
     int index,
     void* params) {
   if (!render_view_host_)
     return;
 
-  const FilePath& path = file.path;
-  profile_->set_last_selected_directory(path.DirName());
+  profile_->set_last_selected_directory(file.file_path.DirName());
 
+  const FilePath& path = file.local_path;
   if (dialog_type_ == SelectFileDialog::SELECT_FOLDER) {
     StartNewEnumeration(path, kFileSelectEnumerationId, render_view_host_);
     return;
   }
 
   std::vector<ui::SelectedFileInfo> files;
   files.push_back(file);
   NotifyRenderViewHost(render_view_host_, files, dialog_type_);
 
   // No members should be accessed from here on.
   RunFileChooserEnd();
 }
 
 void FileSelectHelper::MultiFilesSelected(const std::vector<FilePath>& files,
                                           void* params) {
   std::vector<ui::SelectedFileInfo> selected_files =
-      ConvertToSelectedFileInfoList(files);
+      FilePathListToSelectedFileInfoList(files);
+
   MultiFilesSelectedWithExtraInfo(selected_files, params);
 }
 
 void FileSelectHelper::MultiFilesSelectedWithExtraInfo(
     const std::vector<ui::SelectedFileInfo>& files,
     void* params) {
   if (!files.empty())
-    profile_->set_last_selected_directory(files[0].path.DirName());
+    profile_->set_last_selected_directory(files[0].file_path.DirName());
   if (!render_view_host_)
     return;
 
   NotifyRenderViewHost(render_view_host_, files, dialog_type_);
 
   // No members should be accessed from here on.
   RunFileChooserEnd();
 }
 
 void FileSelectHelper::FileSelectionCanceled(void* params) {
@@ skipping 50 matching lines @@
   scoped_ptr<ActiveDirectoryEnumeration> entry(directory_enumerations_[id]);
   directory_enumerations_.erase(id);
   if (!entry->rvh_)
     return;
   if (error) {
     FileSelectionCanceled(NULL);
     return;
   }
 
   std::vector<ui::SelectedFileInfo> selected_files =
-      ConvertToSelectedFileInfoList(entry->results_);
+      FilePathListToSelectedFileInfoList(entry->results_);
 
   if (id == kFileSelectEnumerationId)
     NotifyRenderViewHost(entry->rvh_, selected_files, dialog_type_);
   else
     entry->rvh_->DirectoryEnumerationFinished(id, entry->results_);
 
   EnumerateDirectoryEnd();
 }
 
 SelectFileDialog::FileTypeInfo* FileSelectHelper::GetFileTypesFromAcceptType(
@@ skipping 231 matching lines @@
   // A 1 character accept type will always be invalid (either a "." in the case
   // of an extension or a "/" in the case of a MIME type).
   std::string unused;
   if (accept_type.length() <= 1 ||
       StringToLowerASCII(accept_type) != accept_type ||
       TrimWhitespaceASCII(accept_type, TRIM_ALL, &unused) != TRIM_NONE) {
     return false;
   }
   return true;
 }