Merge pull request nwjs#278 from zhchbin/master

rogerwang · rogerwang · commit d4f42e1cc10a · 2012-12-20T17:09:00.000-08:00
Drop the #if on Windows
diff --git a/src/browser/shell_resource_dispatcher_host_delegate.cc b/src/browser/shell_resource_dispatcher_host_delegate.cc
@@ -46,12 +46,7 @@ ShellResourceDispatcherHostDelegate::CreateLoginDelegate(
     return NULL;
   }
 
-#if !defined(OS_MACOSX) && !defined(TOOLKIT_GTK)
-// TODO: implement ShellLoginDialog for other platforms, drop this #if
-  return NULL;
-#else
   return new ShellLoginDialog(auth_info, request);
-#endif
 }
 
 }  // namespace content

Original file line number	Diff line number	Diff line change
`@@ -46,12 +46,7 @@ ShellResourceDispatcherHostDelegate::CreateLoginDelegate(`
`46`	`46`	`return NULL;`
`47`	`47`	`}`
`48`	`48`
`49`		`-#if !defined(OS_MACOSX) && !defined(TOOLKIT_GTK)`
`50`		`-// TODO: implement ShellLoginDialog for other platforms, drop this #if`
`51`		`- return NULL;`
`52`		`-#else`
`53`	`49`	`return new ShellLoginDialog(auth_info, request);`
`54`		`-#endif`
`55`	`50`	`}`
`56`	`51`
`57`	`52`	`} // namespace content`