Browse Source

windows build fixes

Jeremy Rose 4 years ago
parent
commit
5b598037bb
2 changed files with 3 additions and 2 deletions
  1. 2 1
      shell/browser/ui/file_dialog_win.cc
  2. 1 1
      shell/browser/web_contents_preferences.cc

+ 2 - 1
shell/browser/ui/file_dialog_win.cc

@@ -6,11 +6,12 @@
 
 #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 <shlobj.h>
 #include <shobjidl.h>
-#include "base/win/shlwapi.h"  // NOLINT(build/include_order)
 
 #include "base/files/file_util.h"
 #include "base/i18n/case_conversion.h"

+ 1 - 1
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 {