Make saving files from flash less annoying.

ui/base/dialogs/select_file_dialog_win.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 "ui/base/dialogs/select_file_dialog_win.h"
 
 #include <windows.h>
 #include <commdlg.h>
 #include <shlobj.h>
 
@@ skipping 57 matching lines @@
       NOTREACHED();
       return false;
     }
 
     return metro_get_save_file_name(ofn) == TRUE;
   } else {
     return GetSaveFileName(ofn) == TRUE;
   }
 }
 
+// Distinguish directories from regular files.
+bool IsDirectory(const FilePath& path) {
+  base::PlatformFileInfo file_info;
+  return file_util::GetFileInfo(path, &file_info) ?
+    file_info.is_directory : file_util::EndsWithSeparator(path);

[Ben Goodger (Google), 2012/08/14 23:06:54]

4-space indent

[Tom Sepez, 2012/08/14 23:10:43]

Done.

+}
+
 // Get the file type description from the registry. This will be "Text Document"
 // for .txt files, "JPEG Image" for .jpg files, etc. If the registry doesn't
 // have an entry for the file type, we return false, true if the description was
 // found. 'file_ext' must be in form ".txt".
 static bool GetRegistryDescriptionFromExtension(const std::wstring& file_ext,
                                                 std::wstring* reg_description) {
   DCHECK(reg_description);
   base::win::RegKey reg_ext(HKEY_CLASSES_ROOT, file_ext.c_str(), KEY_READ);
   std::wstring reg_app;
   if (reg_ext.ReadValue(NULL, &reg_app) == ERROR_SUCCESS && !reg_app.empty()) {
@@ skipping 191 matching lines @@
   save_as.lpstrCustomFilter = NULL;
   save_as.nMaxCustFilter = 0;
   save_as.nFilterIndex = *index;
   save_as.lpstrFile = file_name;
   save_as.nMaxFile = arraysize(file_name);
   save_as.lpstrFileTitle = NULL;
   save_as.nMaxFileTitle = 0;
 
   // Set up the initial directory for the dialog.
   std::wstring directory;
-  if (!suggested_name.empty())
-     directory = suggested_path.DirName().value();
+  if (!suggested_name.empty()) {
+    if (IsDirectory(suggested_path)) {
+      directory = suggested_path.value();
+      file_part.clear();
+    } else {
+      directory = suggested_path.DirName().value();
+    }
+  }
 
   save_as.lpstrInitialDir = directory.c_str();
   save_as.lpstrTitle = NULL;
   save_as.Flags = OFN_OVERWRITEPROMPT | OFN_EXPLORER | OFN_ENABLESIZING |
                   OFN_NOCHANGEDIR | OFN_PATHMUSTEXIST;
   save_as.lpstrDefExt = &def_ext[0];
   save_as.lCustData = NULL;
 
   if (base::win::GetVersion() < base::win::VERSION_VISTA) {
     // The save as on Windows XP remembers its last position,
@@ skipping 407 matching lines @@
   wchar_t filename[MAX_PATH];
   // According to http://support.microsoft.com/?scid=kb;en-us;222003&x=8&y=12,
   // The lpstrFile Buffer MUST be NULL Terminated.
   filename[0] = 0;
   // Define the dir in here to keep the string buffer pointer pointed to
   // ofn.lpstrInitialDir available during the period of running the
   // GetOpenFileName.
   FilePath dir;
   // Use lpstrInitialDir to specify the initial directory
   if (!path->empty()) {
-    bool is_dir;
-    base::PlatformFileInfo file_info;
-    if (file_util::GetFileInfo(*path, &file_info))
-      is_dir = file_info.is_directory;
-    else
-      is_dir = file_util::EndsWithSeparator(*path);
-    if (is_dir) {
+    if (IsDirectory(*path)) {
       ofn.lpstrInitialDir = path->value().c_str();
     } else {
       dir = path->DirName();
       ofn.lpstrInitialDir = dir.value().c_str();
       // Only pure filename can be put in lpstrFile field.
       base::wcslcpy(filename, path->BaseName().value().c_str(),
                     arraysize(filename));
     }
   }
 
@@ skipping 112 matching lines @@
   return return_value;
 }
 
 SelectFileDialog* CreateWinSelectFileDialog(
     SelectFileDialog::Listener* listener,
     SelectFilePolicy* policy) {
   return new SelectFileDialogImpl(listener, policy);
 }
 
 }  // namespace ui