Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(329)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/net.gyp

Issue 242135: Merge r25564 and r26588 from the trunk.... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Undo an extraneous comment change Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_network_transaction_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
===================================================================
--- net/net.gyp (revision 28069)
+++ net/net.gyp (working copy)
@@ -215,6 +215,8 @@
'http/http_auth_handler_digest.h',
'http/http_auth_handler_ntlm.cc',
'http/http_auth_handler_ntlm.h',
+ 'http/http_auth_handler_ntlm_portable.cc',
+ 'http/http_auth_handler_ntlm_win.cc',
'http/http_basic_stream.h',
'http/http_byte_range.cc',
'http/http_byte_range.h',
@@ -363,6 +365,7 @@
[ 'OS == "win"', {
'sources/': [ ['exclude', '_(mac|linux|posix)\\.cc$'] ],
'sources!': [
+ 'http/http_auth_handler_ntlm_portable.cc',
'socket/tcp_client_socket_libevent.cc',
],
'dependencies': [
« no previous file with comments | « net/http/http_network_transaction_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698