Fix nwjs#916: support pac_url and auto proxy detection

rogerwang · rogerwang · commit c45f6864d369 · 2015-08-14T15:10:19.000+08:00
diff --git a/src/api/app/app.cc b/src/api/app/app.cc
@@ -202,9 +202,10 @@ void App::Call(Shell* shell,
         shortcut->GetAccelerator(), shortcut);
     return;
   } else if (method == "SetProxyConfig") {
-    std::string proxy_config;
+    std::string proxy_config, pac_url;
     arguments.GetString(0, &proxy_config);
-    SetProxyConfig(GetRenderProcessHost(), proxy_config);
+    arguments.GetString(1, &pac_url);
+    SetProxyConfig(GetRenderProcessHost(), proxy_config, pac_url);
     return;
   } else if (method == "DoneMenuShow") {
     dispatcher_host->quit_run_loop();
@@ -299,9 +300,18 @@ void App::ClearCache(content::RenderProcessHost* render_process_host) {
 }
 
 void App::SetProxyConfig(content::RenderProcessHost* render_process_host,
-                         const std::string& proxy_config) {
+                         const std::string& proxy_config,
+                         const std::string& pac_url) {
   net::ProxyConfig config;
-  config.proxy_rules().ParseFromString(proxy_config);
+  if (!pac_url.empty()) {
+    if (pac_url == "<direct>")
+      config = net::ProxyConfig::CreateDirect();
+    else if (pac_url == "<auto>")
+      config = net::ProxyConfig::CreateAutoDetect();
+    else
+      config = net::ProxyConfig::CreateFromCustomPacURL(GURL(pac_url));
+  } else
+    config.proxy_rules().ParseFromString(proxy_config);
   net::URLRequestContextGetter* context_getter =
     render_process_host->GetBrowserContext()->
     GetRequestContextForRenderProcess(render_process_host->GetID());
diff --git a/src/api/app/app.h b/src/api/app/app.h
@@ -63,7 +63,8 @@ class App {
 
   static void ClearCache(content::RenderProcessHost* render_view_host);
   static void SetProxyConfig(content::RenderProcessHost* render_process_host,
-                             const std::string& proxy_config);
+                             const std::string& proxy_config,
+                             const std::string& pac_url);
 
  private:
   App();
diff --git a/src/api/app/app.js b/src/api/app/app.js
@@ -69,8 +69,8 @@ App.prototype.getProxyForURL = function (url) {
   return nw.callStaticMethodSync('App', 'getProxyForURL', [ url ]);
 }
 
-App.prototype.setProxyConfig = function (proxy_config) {
-  return nw.callStaticMethodSync('App', 'SetProxyConfig', [ proxy_config ]);
+App.prototype.setProxyConfig = function (proxy_config, pac_url) {
+  return nw.callStaticMethodSync('App', 'SetProxyConfig', [ proxy_config, pac_url ]);
 }
 
 App.prototype.addOriginAccessWhitelistEntry = function(sourceOrigin, destinationProtocol, destinationHost, allowDestinationSubdomains) {

Original file line number	Diff line number	Diff line change
`@@ -69,8 +69,8 @@ App.prototype.getProxyForURL = function (url) {`
`69`	`69`	`return nw.callStaticMethodSync('App', 'getProxyForURL', [ url ]);`
`70`	`70`	`}`
`71`	`71`
`72`		`-App.prototype.setProxyConfig = function (proxy_config) {`
`73`		`- return nw.callStaticMethodSync('App', 'SetProxyConfig', [ proxy_config ]);`
	`72`	`+App.prototype.setProxyConfig = function (proxy_config, pac_url) {`
	`73`	`+ return nw.callStaticMethodSync('App', 'SetProxyConfig', [ proxy_config, pac_url ]);`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`App.prototype.addOriginAccessWhitelistEntry = function(sourceOrigin, destinationProtocol, destinationHost, allowDestinationSubdomains) {`