fix windows paths for content scripts

brave · Feb 7, 2016 · 4675933 · 4675933
1 parent 2fef55c
commit 4675933
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/atom/renderer/atom_renderer_client.cc b/atom/renderer/atom_renderer_client.cc
@@ -33,6 +33,7 @@
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "native_mate/dictionary.h"
+#include "net/base/filename_util.h"
 #include "third_party/WebKit/public/web/WebCustomElement.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
@@ -396,7 +397,9 @@ void AtomRendererClient::DidCreateScriptContext(
                               GetSwitchValueASCII(switches::kContentScripts));
       std::string name;
       while (std::getline(ss, name, ',')) {
-        ExecuteScriptFile(context, base::FilePath::FromUTF8Unsafe(name));
+        base::FilePath file_path;
+        net::FileURLToFilePath(GURL(name), &file_path);
+        ExecuteScriptFile(context, file_path);
       }
     }
     // remove process object from the global scope

diff --git a/atom/renderer/lib/web-view/web-view-attributes.js b/atom/renderer/lib/web-view/web-view-attributes.js
@@ -326,7 +326,7 @@ class ContentScriptsAttribute extends WebViewAttribute {
         console.error(webViewConstants.ERROR_MSG_INVALID_CONTENT_SCRIPT_JS_ATTRIBUTE);
         return null;
       } else {
-        return fileUrl.slice(7); // strip off the file:// prefix
+        return fileUrl;
       }
     }).filter(file => file).join(',');
   }