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

Side by Side Diff: content/browser/renderer_host/resource_dispatcher_host.cc

Issue 7237034: sql::MetaTable.next_download_id, DownloadManager::GetNextId() (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: fix merge Created 9 years, 3 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading 5 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading
6 6
7 #include "content/browser/renderer_host/resource_dispatcher_host.h" 7 #include "content/browser/renderer_host/resource_dispatcher_host.h"
8 8
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 14 matching lines...) Expand all
25 #include "content/browser/chrome_blob_storage_context.h" 25 #include "content/browser/chrome_blob_storage_context.h"
26 #include "content/browser/content_browser_client.h" 26 #include "content/browser/content_browser_client.h"
27 #include "content/browser/cross_site_request_manager.h" 27 #include "content/browser/cross_site_request_manager.h"
28 #include "content/browser/download/download_file_manager.h" 28 #include "content/browser/download/download_file_manager.h"
29 #include "content/browser/download/download_manager.h" 29 #include "content/browser/download/download_manager.h"
30 #include "content/browser/download/download_resource_handler.h" 30 #include "content/browser/download/download_resource_handler.h"
31 #include "content/browser/download/save_file_manager.h" 31 #include "content/browser/download/save_file_manager.h"
32 #include "content/browser/download/save_file_resource_handler.h" 32 #include "content/browser/download/save_file_resource_handler.h"
33 #include "content/browser/in_process_webkit/webkit_thread.h" 33 #include "content/browser/in_process_webkit/webkit_thread.h"
34 #include "content/browser/plugin_service.h" 34 #include "content/browser/plugin_service.h"
35 #include "content/browser/resource_context.h"
36 #include "content/browser/renderer_host/async_resource_handler.h" 35 #include "content/browser/renderer_host/async_resource_handler.h"
37 #include "content/browser/renderer_host/buffered_resource_handler.h" 36 #include "content/browser/renderer_host/buffered_resource_handler.h"
38 #include "content/browser/renderer_host/cross_site_resource_handler.h" 37 #include "content/browser/renderer_host/cross_site_resource_handler.h"
39 #include "content/browser/renderer_host/global_request_id.h" 38 #include "content/browser/renderer_host/global_request_id.h"
40 #include "content/browser/renderer_host/redirect_to_file_resource_handler.h" 39 #include "content/browser/renderer_host/redirect_to_file_resource_handler.h"
41 #include "content/browser/renderer_host/render_view_host.h" 40 #include "content/browser/renderer_host/render_view_host.h"
42 #include "content/browser/renderer_host/render_view_host_delegate.h" 41 #include "content/browser/renderer_host/render_view_host_delegate.h"
43 #include "content/browser/renderer_host/render_view_host_notification_task.h" 42 #include "content/browser/renderer_host/render_view_host_notification_task.h"
44 #include "content/browser/renderer_host/resource_dispatcher_host_delegate.h" 43 #include "content/browser/renderer_host/resource_dispatcher_host_delegate.h"
45 #include "content/browser/renderer_host/resource_dispatcher_host_login_delegate. h" 44 #include "content/browser/renderer_host/resource_dispatcher_host_login_delegate. h"
46 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h" 45 #include "content/browser/renderer_host/resource_dispatcher_host_request_info.h"
47 #include "content/browser/renderer_host/resource_message_filter.h" 46 #include "content/browser/renderer_host/resource_message_filter.h"
48 #include "content/browser/renderer_host/resource_queue.h" 47 #include "content/browser/renderer_host/resource_queue.h"
49 #include "content/browser/renderer_host/resource_request_details.h" 48 #include "content/browser/renderer_host/resource_request_details.h"
50 #include "content/browser/renderer_host/sync_resource_handler.h" 49 #include "content/browser/renderer_host/sync_resource_handler.h"
50 #include "content/browser/resource_context.h"
51 #include "content/browser/ssl/ssl_client_auth_handler.h" 51 #include "content/browser/ssl/ssl_client_auth_handler.h"
52 #include "content/browser/ssl/ssl_manager.h" 52 #include "content/browser/ssl/ssl_manager.h"
53 #include "content/browser/worker_host/worker_service.h" 53 #include "content/browser/worker_host/worker_service.h"
54 #include "content/common/content_switches.h" 54 #include "content/common/content_switches.h"
55 #include "content/common/notification_service.h" 55 #include "content/common/notification_service.h"
56 #include "content/common/resource_messages.h" 56 #include "content/common/resource_messages.h"
57 #include "content/common/url_constants.h" 57 #include "content/common/url_constants.h"
58 #include "content/common/view_messages.h" 58 #include "content/common/view_messages.h"
59 #include "net/base/auth.h" 59 #include "net/base/auth.h"
60 #include "net/base/cert_status_flags.h" 60 #include "net/base/cert_status_flags.h"
(...skipping 740 matching lines...) Expand 10 before | Expand all | Expand 10 after
801 CanRequestURL(child_id, url)) { 801 CanRequestURL(child_id, url)) {
802 VLOG(1) << "Denied unauthorized download request for " 802 VLOG(1) << "Denied unauthorized download request for "
803 << url.possibly_invalid_spec(); 803 << url.possibly_invalid_spec();
804 return; 804 return;
805 } 805 }
806 806
807 net::URLRequest* request = new net::URLRequest(url, this); 807 net::URLRequest* request = new net::URLRequest(url, this);
808 808
809 request_id_--; 809 request_id_--;
810 810
811 DownloadId dl_id = context.next_download_id_thunk().Run();
812
811 scoped_refptr<ResourceHandler> handler( 813 scoped_refptr<ResourceHandler> handler(
812 new DownloadResourceHandler(this, 814 new DownloadResourceHandler(this,
813 child_id, 815 child_id,
814 route_id, 816 route_id,
815 request_id_, 817 request_id_,
816 url, 818 url,
819 dl_id,
817 download_file_manager_.get(), 820 download_file_manager_.get(),
818 request, 821 request,
819 prompt_for_save_location, 822 prompt_for_save_location,
820 save_info)); 823 save_info));
821 824
822 if (delegate_) { 825 if (delegate_) {
823 handler = delegate_->DownloadStarting( 826 handler = delegate_->DownloadStarting(
824 handler, context, request, child_id, route_id, request_id_, true, 827 handler, context, request, child_id, route_id, request_id_, true,
825 false); 828 false);
826 } 829 }
827 830
828 const net::URLRequestContext* request_context = context.request_context(); 831 const net::URLRequestContext* request_context = context.request_context();
829 832
830 if (!request_context->job_factory()->IsHandledURL(url)) { 833 if (!request_context->job_factory()->IsHandledURL(url)) {
831 VLOG(1) << "Download request for unsupported protocol: " 834 VLOG(1) << "Download request for unsupported protocol: "
832 << url.possibly_invalid_spec(); 835 << url.possibly_invalid_spec();
833 return; 836 return;
834 } 837 }
835 838
836 request->set_method("GET"); 839 request->set_method("GET");
837 request->set_referrer(MaybeStripReferrer(referrer).spec()); 840 request->set_referrer(MaybeStripReferrer(referrer).spec());
838 request->set_context(context.request_context()); 841 request->set_context(request_context);
839 request->set_load_flags(request->load_flags() | 842 request->set_load_flags(request->load_flags() |
840 net::LOAD_IS_DOWNLOAD); 843 net::LOAD_IS_DOWNLOAD);
841 844
842 ResourceDispatcherHostRequestInfo* extra_info = 845 ResourceDispatcherHostRequestInfo* extra_info =
843 CreateRequestInfoForBrowserRequest( 846 CreateRequestInfoForBrowserRequest(
844 handler, child_id, route_id, true, context); 847 handler, child_id, route_id, true, context);
845 SetRequestInfo(request, extra_info); // Request takes ownership. 848 SetRequestInfo(request, extra_info); // Request takes ownership.
846 849
847 BeginRequestInternal(request); 850 BeginRequestInternal(request);
848 } 851 }
(...skipping 1284 matching lines...) Expand 10 before | Expand all | Expand 10 after
2133 return HTTP_AUTH_RESOURCE_BLOCKED_CROSS; 2136 return HTTP_AUTH_RESOURCE_BLOCKED_CROSS;
2134 } 2137 }
2135 2138
2136 bool ResourceDispatcherHost::allow_cross_origin_auth_prompt() { 2139 bool ResourceDispatcherHost::allow_cross_origin_auth_prompt() {
2137 return allow_cross_origin_auth_prompt_; 2140 return allow_cross_origin_auth_prompt_;
2138 } 2141 }
2139 2142
2140 void ResourceDispatcherHost::set_allow_cross_origin_auth_prompt(bool value) { 2143 void ResourceDispatcherHost::set_allow_cross_origin_auth_prompt(bool value) {
2141 allow_cross_origin_auth_prompt_ = value; 2144 allow_cross_origin_auth_prompt_ = value;
2142 } 2145 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698