summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-18 03:08:13 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-18 03:08:13 +0000
commit9e473f274287cb8e5e110f43a068a88981e9ea54 (patch)
tree48dfc89c8f226b08a86af8b89c4abe1169c345b2
parentac5994ff2ee1078080aa88e3d490b07eec89dfb6 (diff)
downloadchromium_src-9e473f274287cb8e5e110f43a068a88981e9ea54.zip
chromium_src-9e473f274287cb8e5e110f43a068a88981e9ea54.tar.gz
chromium_src-9e473f274287cb8e5e110f43a068a88981e9ea54.tar.bz2
In r2658, the new http_auth* files were added to net.vcproj
twice and added to the wrong place (wrong in alphabetical order) of the file list. In r7854 the wrong order of files was propagated to net_lib.scons. This change fixes both of these problems. R=eroman Review URL: http://codereview.chromium.org/20438 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9933 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/build/net.vcproj86
-rw-r--r--net/net_lib.scons20
2 files changed, 37 insertions, 69 deletions
diff --git a/net/build/net.vcproj b/net/build/net.vcproj
index 4721309..073c377 100644
--- a/net/build/net.vcproj
+++ b/net/build/net.vcproj
@@ -701,143 +701,111 @@
>
</File>
<File
- RelativePath="..\http\http_cache.cc"
- >
- </File>
- <File
- RelativePath="..\http\http_cache.h"
- >
- </File>
- <File
- RelativePath="..\http\http_chunked_decoder.cc"
- >
- </File>
- <File
- RelativePath="..\http\http_chunked_decoder.h"
- >
- </File>
- <File
- RelativePath="..\http\http_network_layer.cc"
- >
- </File>
- <File
- RelativePath="..\http\http_network_layer.h"
- >
- </File>
- <File
- RelativePath="..\http\http_network_session.h"
- >
- </File>
- <File
- RelativePath="..\http\http_network_transaction.cc"
- >
- </File>
- <File
- RelativePath="..\http\http_network_transaction.h"
+ RelativePath="..\http\http_auth.cc"
>
</File>
<File
- RelativePath="..\http\http_request_info.h"
+ RelativePath="..\http\http_auth.h"
>
</File>
<File
- RelativePath="..\http\http_response_headers.cc"
+ RelativePath="..\http\http_auth_cache.cc"
>
</File>
<File
- RelativePath="..\http\http_response_headers.h"
+ RelativePath="..\http\http_auth_cache.h"
>
</File>
<File
- RelativePath="..\http\http_response_info.h"
+ RelativePath="..\http\http_auth_handler.cc"
>
</File>
<File
- RelativePath="..\http\http_transaction.h"
+ RelativePath="..\http\http_auth_handler.h"
>
</File>
<File
- RelativePath="..\http\http_transaction_factory.h"
+ RelativePath="..\http\http_auth_handler_basic.cc"
>
</File>
<File
- RelativePath="..\http\http_util.cc"
+ RelativePath="..\http\http_auth_handler_basic.h"
>
</File>
<File
- RelativePath="..\http\http_util.h"
+ RelativePath="..\http\http_auth_handler_digest.cc"
>
</File>
<File
- RelativePath="..\http\http_auth.cc"
+ RelativePath="..\http\http_auth_handler_digest.h"
>
</File>
<File
- RelativePath="..\http\http_auth.h"
+ RelativePath="..\http\http_cache.cc"
>
</File>
<File
- RelativePath="..\http\http_auth_cache.cc"
+ RelativePath="..\http\http_cache.h"
>
</File>
<File
- RelativePath="..\http\http_auth_cache.h"
+ RelativePath="..\http\http_chunked_decoder.cc"
>
</File>
<File
- RelativePath="..\http\http_auth_handler.h"
+ RelativePath="..\http\http_chunked_decoder.h"
>
</File>
<File
- RelativePath="..\http\http_auth_handler.cc"
+ RelativePath="..\http\http_network_layer.cc"
>
</File>
<File
- RelativePath="..\http\http_auth_handler_basic.cc"
+ RelativePath="..\http\http_network_layer.h"
>
</File>
<File
- RelativePath="..\http\http_auth_handler_basic.h"
+ RelativePath="..\http\http_network_session.h"
>
</File>
<File
- RelativePath="..\http\http_auth_handler_digest.cc"
+ RelativePath="..\http\http_network_transaction.cc"
>
</File>
<File
- RelativePath="..\http\http_auth_handler_digest.h"
+ RelativePath="..\http\http_network_transaction.h"
>
</File>
<File
- RelativePath="..\http\http_auth.cc"
+ RelativePath="..\http\http_request_info.h"
>
</File>
<File
- RelativePath="..\http\http_auth.h"
+ RelativePath="..\http\http_response_headers.cc"
>
</File>
<File
- RelativePath="..\http\http_auth_handler.h"
+ RelativePath="..\http\http_response_headers.h"
>
</File>
<File
- RelativePath="..\http\http_auth_handler.cc"
+ RelativePath="..\http\http_response_info.h"
>
</File>
<File
- RelativePath="..\http\http_auth_handler_basic.cc"
+ RelativePath="..\http\http_transaction.h"
>
</File>
<File
- RelativePath="..\http\http_auth_handler_basic.h"
+ RelativePath="..\http\http_transaction_factory.h"
>
</File>
<File
- RelativePath="..\http\http_auth_handler_digest.cc"
+ RelativePath="..\http\http_util.cc"
>
</File>
<File
- RelativePath="..\http\http_auth_handler_digest.h"
+ RelativePath="..\http\http_util.h"
>
</File>
<File
diff --git a/net/net_lib.scons b/net/net_lib.scons
index bba6784..5f2f3f0 100644
--- a/net/net_lib.scons
+++ b/net/net_lib.scons
@@ -158,6 +158,16 @@ input_files = ChromeFileList([
]),
MSVSFilter('http', [
'http/http_atom_list.h',
+ 'http/http_auth.cc',
+ 'http/http_auth.h',
+ 'http/http_auth_cache.cc',
+ 'http/http_auth_cache.h',
+ 'http/http_auth_handler.h',
+ 'http/http_auth_handler.cc',
+ 'http/http_auth_handler_basic.cc',
+ 'http/http_auth_handler_basic.h',
+ 'http/http_auth_handler_digest.cc',
+ 'http/http_auth_handler_digest.h',
'http/http_cache.cc',
'http/http_cache.h',
'http/http_chunked_decoder.cc',
@@ -175,16 +185,6 @@ input_files = ChromeFileList([
'http/http_transaction_factory.h',
'http/http_util.cc',
'http/http_util.h',
- 'http/http_auth.cc',
- 'http/http_auth.h',
- 'http/http_auth_cache.cc',
- 'http/http_auth_cache.h',
- 'http/http_auth_handler.h',
- 'http/http_auth_handler.cc',
- 'http/http_auth_handler_basic.cc',
- 'http/http_auth_handler_basic.h',
- 'http/http_auth_handler_digest.cc',
- 'http/http_auth_handler_digest.h',
'http/http_vary_data.cc',
'http/http_vary_data.h',
]),