mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

windows build fixes

Browse source
This commit is contained in:
Jeremy Rose 2021-03-22 15:49:43 -07:00
parent ea62ecd188
commit 5b598037bb
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
shell/browser/ui/file_dialog_win.cc
View file

@ -6,11 +6,12 @@
#include <windows.h> // windows.h must be included first #include <windows.h> // windows.h must be included first
#include "base/win/shlwapi.h" // NOLINT(build/include_order)
#include <atlbase.h> // atlbase.h for CComPtr #include <atlbase.h> // atlbase.h for CComPtr
#include <shlobj.h> #include <shlobj.h>
#include <shobjidl.h> #include <shobjidl.h>
#include "base/win/shlwapi.h" // NOLINT(build/include_order)
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/i18n/case_conversion.h" #include "base/i18n/case_conversion.h"

2
shell/browser/web_contents_preferences.cc
View file

@ -267,7 +267,7 @@ bool WebContentsPreferences::GetPreloadPath(base::FilePath* path) const {
#else #else
preload_url = GURL(preload_path); preload_url = GURL(preload_path);
#endif #endif
if (net::FileURLToFilePath(GURL(preload_path), &preload)) { if (net::FileURLToFilePath(preload_url, &preload)) {
*path = std::move(preload); *path = std::move(preload);
return true; return true;
} else { } else {