Experimentally isolate GetOpenFileName in a utility process.

ui/shell_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/shell_dialogs/select_file_dialog_win.h"
 
-#include <windows.h>
-#include <commdlg.h>
 #include <shlobj.h>
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/i18n/case_conversion.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 12 matching lines @@
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/win/open_file_name_win.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/shell_dialogs/base_shell_dialog_win.h"
 #include "ui/shell_dialogs/shell_dialogs_delegate.h"
 #include "win8/viewer/metro_viewer_process_host.h"
 
 namespace {
 
+  bool CallBuiltinGetOpenFileName(OPENFILENAME* ofn) {

[sky, 2014/07/31 20:47:46]

nit: don't indent this (same as 44 below).

[erikwright (departed), 2014/08/01 13:53:15]

Done.

+    return GetOpenFileName(ofn) == TRUE;
+  }
+
 // Given |extension|, if it's not empty, then remove the leading dot.
 std::wstring GetExtensionWithoutLeadingDot(const std::wstring& extension) {
   DCHECK(extension.empty() || extension[0] == L'.');
   return extension.empty() ? extension : extension.substr(1);
 }
 
 // Diverts to a metro-specific implementation as appropriate.
-bool CallGetOpenFileName(OPENFILENAME* ofn) {
-  HMODULE metro_module = base::win::GetMetroModule();
-  if (metro_module != NULL) {
-    typedef BOOL (*MetroGetOpenFileName)(OPENFILENAME*);
-    MetroGetOpenFileName metro_get_open_file_name =
-        reinterpret_cast<MetroGetOpenFileName>(
-            ::GetProcAddress(metro_module, "MetroGetOpenFileName"));
-    if (metro_get_open_file_name == NULL) {
-      NOTREACHED();
-      return false;
-    }
-
-    return metro_get_open_file_name(ofn) == TRUE;
-  } else {
-    return GetOpenFileName(ofn) == TRUE;
-  }
-}
-
-// Diverts to a metro-specific implementation as appropriate.
 bool CallGetSaveFileName(OPENFILENAME* ofn) {
   HMODULE metro_module = base::win::GetMetroModule();
   if (metro_module != NULL) {
     typedef BOOL (*MetroGetSaveFileName)(OPENFILENAME*);
     MetroGetSaveFileName metro_get_save_file_name =
         reinterpret_cast<MetroGetSaveFileName>(
             ::GetProcAddress(metro_module, "MetroGetSaveFileName"));
     if (metro_get_save_file_name == NULL) {
       NOTREACHED();
       return false;
@@ skipping 326 matching lines @@
                               false,
                               &index,
                               final_name);
 }
 
 // Implementation of SelectFileDialog that shows a Windows common dialog for
 // choosing a file or folder.
 class SelectFileDialogImpl : public ui::SelectFileDialog,
                              public ui::BaseShellDialogImpl {
  public:
-  explicit SelectFileDialogImpl(Listener* listener,
-                                ui::SelectFilePolicy* policy);
+  SelectFileDialogImpl(
+      Listener* listener,
+      ui::SelectFilePolicy* policy,
+      const base::Callback<bool(OPENFILENAME*)>& get_open_file_name_impl);
 
   // BaseShellDialog implementation:
   virtual bool IsRunning(gfx::NativeWindow owning_window) const OVERRIDE;
   virtual void ListenerDestroyed() OVERRIDE;
 
  protected:
   // SelectFileDialog implementation:
   virtual void SelectFileImpl(
       Type type,
       const base::string16& title,
@@ skipping 88 matching lines @@
                                          LPARAM data);
 
   virtual bool HasMultipleFileTypeChoicesImpl() OVERRIDE;
 
   // Returns the filter to be used while displaying the open/save file dialog.
   // This is computed from the extensions for the file types being opened.
   // |file_types| can be NULL in which case the returned filter will be empty.
   base::string16 GetFilterForFileTypes(const FileTypeInfo* file_types);
 
   bool has_multiple_file_type_choices_;
+  base::Callback<bool(OPENFILENAME*)> get_open_file_name_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(SelectFileDialogImpl);
 };
 
-SelectFileDialogImpl::SelectFileDialogImpl(Listener* listener,
-                                           ui::SelectFilePolicy* policy)
+SelectFileDialogImpl::SelectFileDialogImpl(
+    Listener* listener,
+    ui::SelectFilePolicy* policy,
+    const base::Callback<bool(OPENFILENAME*)>& get_open_file_name_impl)
     : SelectFileDialog(listener, policy),
       BaseShellDialogImpl(),
-      has_multiple_file_type_choices_(false) {
+      has_multiple_file_type_choices_(false),
+      get_open_file_name_impl_(get_open_file_name_impl) {
 }
 
 SelectFileDialogImpl::~SelectFileDialogImpl() {
 }
 
 void SelectFileDialogImpl::SelectFileImpl(
     Type type,
     const base::string16& title,
     const base::FilePath& default_path,
     const FileTypeInfo* file_types,
@@ skipping 237 matching lines @@
   ui::win::OpenFileName ofn(owner, OFN_FILEMUSTEXIST | OFN_NOCHANGEDIR);
   if (!path->empty()) {
     if (IsDirectory(*path))
       ofn.SetInitialSelection(*path, base::FilePath());
     else
       ofn.SetInitialSelection(path->DirName(), path->BaseName());
   }
 
   if (!filter.empty())
     ofn.Get()->lpstrFilter = filter.c_str();
-  bool success = CallGetOpenFileName(ofn.Get());
+
+  bool success = get_open_file_name_impl_.Run(ofn.Get());
   DisableOwner(owner);
   if (success)
     *path = ofn.GetSingleResult();
   return success;
 }
 
 bool SelectFileDialogImpl::RunOpenMultiFileDialog(
     const std::wstring& title,
     const std::wstring& filter,
     HWND owner,
     std::vector<base::FilePath>* paths) {
   // We use OFN_NOCHANGEDIR so that the user can rename or delete the directory
   // without having to close Chrome first.
   ui::win::OpenFileName ofn(owner,
                             OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST |
                                 OFN_EXPLORER | OFN_HIDEREADONLY |
                                 OFN_ALLOWMULTISELECT | OFN_NOCHANGEDIR);
 
   if (!filter.empty())
     ofn.Get()->lpstrFilter = filter.c_str();
 
   base::FilePath directory;
   std::vector<base::FilePath> filenames;
 
-  if (CallGetOpenFileName(ofn.Get()))
+  if (get_open_file_name_impl_.Run(ofn.Get()))
     ofn.GetResult(&directory, &filenames);
+
   DisableOwner(owner);
 
   for (std::vector<base::FilePath>::iterator it = filenames.begin();
        it != filenames.end();
        ++it) {
     paths->push_back(directory.Append(*it));
   }
 
   return !paths->empty();
 }
@@ skipping 61 matching lines @@
   // Strip any trailing dots, which Windows doesn't allow.
   size_t index = return_value.find_last_not_of(L'.');
   if (index < return_value.size() - 1)
     return_value.resize(index + 1);
 
   return return_value;
 }
 
 SelectFileDialog* CreateWinSelectFileDialog(
     SelectFileDialog::Listener* listener,
+    SelectFilePolicy* policy,
+    const base::Callback<bool(OPENFILENAME* ofn)>& get_open_file_name_impl) {
+  return new SelectFileDialogImpl(listener, policy, get_open_file_name_impl);
+}
+
+SelectFileDialog* CreateDefaultWinSelectFileDialog(
+    SelectFileDialog::Listener* listener,
     SelectFilePolicy* policy) {
-  return new SelectFileDialogImpl(listener, policy);
+  return CreateWinSelectFileDialog(
+      listener, policy, base::Bind(&CallBuiltinGetOpenFileName));
 }
 
 }  // namespace ui