From 5b598037bba8ace5ab3dbb7df82555b71dba7c11 Mon Sep 17 00:00:00 2001 From: Jeremy Rose Date: Mon, 22 Mar 2021 15:49:43 -0700 Subject: [PATCH] windows build fixes --- shell/browser/ui/file_dialog_win.cc | 3 ++- shell/browser/web_contents_preferences.cc | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/shell/browser/ui/file_dialog_win.cc b/shell/browser/ui/file_dialog_win.cc index 44453ed4bb8f..25d1e4d059c6 100644 --- a/shell/browser/ui/file_dialog_win.cc +++ b/shell/browser/ui/file_dialog_win.cc @@ -6,11 +6,12 @@ #include // windows.h must be included first +#include "base/win/shlwapi.h" // NOLINT(build/include_order) + #include // atlbase.h for CComPtr #include #include -#include "base/win/shlwapi.h" // NOLINT(build/include_order) #include "base/files/file_util.h" #include "base/i18n/case_conversion.h" diff --git a/shell/browser/web_contents_preferences.cc b/shell/browser/web_contents_preferences.cc index a02fadfc6a09..a34ca795a277 100644 --- a/shell/browser/web_contents_preferences.cc +++ b/shell/browser/web_contents_preferences.cc @@ -267,7 +267,7 @@ bool WebContentsPreferences::GetPreloadPath(base::FilePath* path) const { #else preload_url = GURL(preload_path); #endif - if (net::FileURLToFilePath(GURL(preload_path), &preload)) { + if (net::FileURLToFilePath(preload_url, &preload)) { *path = std::move(preload); return true; } else {