Merge pull request nwjs#406 from zhchbin/issue403

rogerwang · rogerwang · commit bdcffb1ce1ce · 2013-01-30T18:11:40.000-08:00
Implement HandleExternalProtocol of the ShellResourceDispatcherHostDelegate
diff --git a/src/browser/shell_resource_dispatcher_host_delegate.cc b/src/browser/shell_resource_dispatcher_host_delegate.cc
@@ -20,7 +20,10 @@
 
 #include "content/nw/src/browser/shell_resource_dispatcher_host_delegate.h"
 
+#include "chrome/browser/platform_util.h"
 #include "content/nw/src/browser/shell_login_dialog.h"
+#include "content/public/browser/browser_thread.h"
+
 
 namespace content {
 
@@ -49,4 +52,22 @@ ShellResourceDispatcherHostDelegate::CreateLoginDelegate(
   return new ShellLoginDialog(auth_info, request);
 }
 
+bool ShellResourceDispatcherHostDelegate::HandleExternalProtocol(
+    const GURL& url, int child_id, int route_id) {
+#if defined(OS_MACOSX)
+  // This must run on the UI thread on OS X.
+  platform_util::OpenExternal(url);
+#else
+  // Otherwise put this work on the file thread. On Windows ShellExecute may
+  // block for a significant amount of time, and it shouldn't hurt on Linux.
+  BrowserThread::PostTask(
+      BrowserThread::FILE,
+      FROM_HERE,
+      base::Bind(&platform_util::OpenExternal, url));
+#endif
+
+  return true;
+}
+
+
 }  // namespace content
diff --git a/src/browser/shell_resource_dispatcher_host_delegate.h b/src/browser/shell_resource_dispatcher_host_delegate.h
@@ -22,6 +22,9 @@ class ShellResourceDispatcherHostDelegate
                                  net::AuthChallengeInfo* auth_info) OVERRIDE;
   virtual ResourceDispatcherHostLoginDelegate* CreateLoginDelegate(
       net::AuthChallengeInfo* auth_info, net::URLRequest* request) OVERRIDE;
+  virtual bool HandleExternalProtocol(const GURL& url,
+                                      int child_id,
+                                      int route_id) OVERRIDE;
 
   // Used for content_browsertests.
   void set_login_request_callback(
