Commit 5bcdfd9c authored by Asanka Herath's avatar Asanka Herath Committed by Commit Bot

Remove usage of SEE_MASK_FLAG_NO_UI from ui::base::win

The flag was originally added to suppress messages from popping up if
the Windows shell failed to open the specified item.

Specifically, the ui::base::win::OpenAnyViaShell() function handles the
case where ShellExecute() returns ERROR_NO_ASSOCIATION when invoked with
the "open" verb by attempting to invoke the same using the "openas"
verb. Thus an intervening error message would not have been useful.
However the SEE_MASK_FLAG_NO_UI flag may suppress other error messages
and may also have side-effects beyond the display of failure messages.
See bug for details.

Bug: 819809
Change-Id: I8def155aa11b14f9a57a8f66add193dc281971cb
Reviewed-on: https://chromium-review.googlesource.com/966963
Commit-Queue: Asanka Herath <asanka@chromium.org>
Reviewed-by: default avatarEric Lawrence <elawrence@chromium.org>
Reviewed-by: default avatarScott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548039}
parent 3c526eca
...@@ -27,29 +27,21 @@ namespace win { ...@@ -27,29 +27,21 @@ namespace win {
namespace { namespace {
// Default ShellExecuteEx flags used with the "openas" verb. // Default ShellExecuteEx flags used with "openas", "explore", and default
// verbs.
// //
// SEE_MASK_NOASYNC is specified so that ShellExecuteEx can be invoked from a // SEE_MASK_NOASYNC is specified so that ShellExecuteEx can be invoked from a
// thread whose message loop may not wait around long enough for the // thread whose message loop may not wait around long enough for the
// asynchronous tasks initiated by ShellExecuteEx to complete. Using this flag // asynchronous tasks initiated by ShellExecuteEx to complete. Using this flag
// causes ShellExecuteEx() to block until these tasks complete. // causes ShellExecuteEx() to block until these tasks complete.
const DWORD kDefaultOpenAsFlags = SEE_MASK_NOASYNC; const DWORD kDefaultShellExecuteFlags = SEE_MASK_NOASYNC;
// Default ShellExecuteEx flags used with the "explore", "open" or default verb.
//
// See kDefaultOpenFlags for description SEE_MASK_NOASYNC flag.
// SEE_MASK_FLAG_NO_UI is used to suppress any error message boxes that might be
// displayed if there is an error in opening the file. Failure in invoking the
// "open" actions result in invocation of the "saveas" verb, making the error
// dialog superfluous.
const DWORD kDefaultOpenFlags = SEE_MASK_NOASYNC | SEE_MASK_FLAG_NO_UI;
// Invokes ShellExecuteExW() with the given parameters. // Invokes ShellExecuteExW() with the given parameters.
DWORD InvokeShellExecute(const base::string16 path, bool InvokeShellExecute(const base::string16 path,
const base::string16 working_directory, const base::string16 working_directory,
const base::string16 args, const base::string16 args,
const base::string16 verb, const base::string16 verb,
DWORD mask) { DWORD mask) {
base::AssertBlockingAllowed(); base::AssertBlockingAllowed();
SHELLEXECUTEINFO sei = {sizeof(sei)}; SHELLEXECUTEINFO sei = {sizeof(sei)};
sei.fMask = mask; sei.fMask = mask;
...@@ -59,7 +51,7 @@ DWORD InvokeShellExecute(const base::string16 path, ...@@ -59,7 +51,7 @@ DWORD InvokeShellExecute(const base::string16 path,
sei.lpDirectory = sei.lpDirectory =
(working_directory.empty() ? nullptr : working_directory.c_str()); (working_directory.empty() ? nullptr : working_directory.c_str());
sei.lpParameters = (args.empty() ? nullptr : args.c_str()); sei.lpParameters = (args.empty() ? nullptr : args.c_str());
return ::ShellExecuteExW(&sei) ? ERROR_SUCCESS : ::GetLastError(); return ::ShellExecuteExW(&sei);
} }
} // namespace } // namespace
...@@ -68,32 +60,22 @@ bool OpenAnyViaShell(const base::string16& full_path, ...@@ -68,32 +60,22 @@ bool OpenAnyViaShell(const base::string16& full_path,
const base::string16& directory, const base::string16& directory,
const base::string16& args, const base::string16& args,
DWORD mask) { DWORD mask) {
DWORD open_result = return InvokeShellExecute(full_path, directory, args, base::string16(), mask);
InvokeShellExecute(full_path, directory, args, base::string16(), mask);
if (open_result == ERROR_SUCCESS)
return true;
// Show the Windows "Open With" dialog box to ask the user to pick an app to
// open the file with. Note that we are not forwarding |args| for the "openas"
// call since the target application is nolonger known at this point.
if (open_result == ERROR_NO_ASSOCIATION)
return InvokeShellExecute(full_path, directory, base::string16(), L"openas",
kDefaultOpenAsFlags) == ERROR_SUCCESS;
return false;
} }
bool OpenFileViaShell(const base::FilePath& full_path) { bool OpenFileViaShell(const base::FilePath& full_path) {
return OpenAnyViaShell(full_path.value(), full_path.DirName().value(), // Invoke the default verb on the file with no arguments.
base::string16(), kDefaultOpenFlags); return InvokeShellExecute(full_path.value(), full_path.DirName().value(),
base::string16(), base::string16(),
kDefaultShellExecuteFlags);
} }
bool OpenFolderViaShell(const base::FilePath& full_path) { bool OpenFolderViaShell(const base::FilePath& full_path) {
// The "explore" verb causes the folder at |full_path| to be displayed in a // The "explore" verb causes the folder at |full_path| to be displayed in a
// file browser. This will fail if |full_path| is not a directory. The // file browser. This will fail if |full_path| is not a directory.
// resulting error does not cause UI due to the SEE_MASK_FLAG_NO_UI flag in
// kDefaultOpenFlags.
return InvokeShellExecute(full_path.value(), full_path.value(), return InvokeShellExecute(full_path.value(), full_path.value(),
base::string16(), L"explore", base::string16(), L"explore",
kDefaultOpenFlags) == ERROR_SUCCESS; kDefaultShellExecuteFlags);
} }
bool PreventWindowFromPinning(HWND hwnd) { bool PreventWindowFromPinning(HWND hwnd) {
......
...@@ -17,8 +17,8 @@ class FilePath; ...@@ -17,8 +17,8 @@ class FilePath;
namespace ui { namespace ui {
namespace win { namespace win {
// Open the folder at |full_path| via the Windows shell. Does nothing if // Open the folder at |full_path| via the Windows shell. It is an error if
// |full_path| is not a folder. // |full_path| does not refer to a folder.
// //
// Note: Must be called on a thread that allows blocking. // Note: Must be called on a thread that allows blocking.
UI_BASE_EXPORT bool OpenFolderViaShell(const base::FilePath& full_path); UI_BASE_EXPORT bool OpenFolderViaShell(const base::FilePath& full_path);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment