Adds the optional suggestedName to the chooseFile fileSystem API call.

chrome/browser/extensions/api/file_system/file_system_api.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/extensions/api/file_system/file_system_api.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 226 matching lines @@
 // Handles showing a dialog to the user to ask for the filename for a file to
 // save or open.
 class FileSystemChooseFileFunction::FilePicker
     : public SelectFileDialog::Listener {
  public:
   FilePicker(FileSystemChooseFileFunction* function,
              content::WebContents* web_contents,
              const FilePath& suggested_path,
              SelectFileDialog::Type picker_type,
              EntryType entry_type)
       : suggested_path_(suggested_path),

[benwells, 2012/07/12 08:23:33]

Nit: change suggested_path here to suggested_name.

[thorogood, 2012/07/12 08:40:20]

Done, and I've changed it in a few other places in this file.

         entry_type_(entry_type),
         function_(function) {
     select_file_dialog_ = SelectFileDialog::Create(
         this, new ChromeSelectFilePolicy(web_contents));
     SelectFileDialog::FileTypeInfo file_type_info;
     FilePath::StringType extension = suggested_path.Extension();
     if (!extension.empty()) {
       extension.erase(extension.begin());  // drop the .
       file_type_info.extensions.resize(1);
       file_type_info.extensions[0].push_back(extension);
@@ skipping 107 matching lines @@
 
 void FileSystemChooseFileFunction::FileSelectionCanceled() {
   error_ = kUserCancelled;
   SendResponse(false);
 }
 
 bool FileSystemChooseFileFunction::RunImpl() {
   scoped_ptr<ChooseFile::Params> params(ChooseFile::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
 
+  FilePath suggested_path;

[benwells, 2012/07/12 08:23:33]

Nit: suggested_name

[thorogood, 2012/07/12 08:40:20]

Done.

   EntryType entry_type = READ_ONLY;
   SelectFileDialog::Type picker_type = SelectFileDialog::SELECT_OPEN_FILE;
+
   file_system::ChooseFileOptions* options = params->options.get();
-  if (options && options->type.get()) {
-    if (*options->type == kOpenWritableFileOption) {
-      entry_type = WRITABLE;
-    } else if (*options->type == kSaveFileOption) {
-      entry_type = WRITABLE;
-      picker_type = SelectFileDialog::SELECT_SAVEAS_FILE;
-    } else if (*options->type != kOpenFileOption) {
-      error_ = kUnknownChooseFileType;
-      return false;
+  if (options) {
+    if (options->type.get()) {
+      if (*options->type == kOpenWritableFileOption) {
+        entry_type = WRITABLE;
+      } else if (*options->type == kSaveFileOption) {
+        entry_type = WRITABLE;
+        picker_type = SelectFileDialog::SELECT_SAVEAS_FILE;
+      } else if (*options->type != kOpenFileOption) {
+        error_ = kUnknownChooseFileType;
+        return false;
+      }
+    }
+
+    if (options->suggested_name.get()) {
+      suggested_path = FilePath::FromUTF8Unsafe(*options->suggested_name.get())

[benwells, 2012/07/12 08:23:33]

We should just use BaseName, so if an extension tries to put in a complete path
the directory information would be stripped.

[thorogood, 2012/07/12 08:40:20]

Done. BaseName may still return an absolute path if the path is a root path
name. So if an app says suggestedName: '/', then we'd end up always opening the
user in the root folder (and similar on Windows for C:\, D:\ etc). I've added a
check for this too which just clears the name.

     }
   }
 
   if (entry_type == WRITABLE && !HasFileSystemWritePermission()) {
     error_ = kRequiresFileSystemWriteError;
     return false;
   }
 
-  return ShowPicker(FilePath(), picker_type, entry_type);
+  return ShowPicker(suggested_path, picker_type, entry_type);
 }
 
 }  // namespace extensions