| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/loader/resource_dispatcher_host_impl.h" | 7 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 945 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 956 referrer.policy); | 956 referrer.policy); |
| 957 net::HttpRequestHeaders headers; | 957 net::HttpRequestHeaders headers; |
| 958 headers.AddHeadersFromString(request_data.headers); | 958 headers.AddHeadersFromString(request_data.headers); |
| 959 request->SetExtraRequestHeaders(headers); | 959 request->SetExtraRequestHeaders(headers); |
| 960 } | 960 } |
| 961 | 961 |
| 962 // TODO(darin): Do we really need all of these URLRequest setters in the | 962 // TODO(darin): Do we really need all of these URLRequest setters in the |
| 963 // transferred navigation case? | 963 // transferred navigation case? |
| 964 | 964 |
| 965 request->set_load_flags(load_flags); | 965 request->set_load_flags(load_flags); |
| 966 request->set_priority(request_data.priority); | 966 request->SetPriority(request_data.priority); |
| 967 | 967 |
| 968 // Resolve elements from request_body and prepare upload data. | 968 // Resolve elements from request_body and prepare upload data. |
| 969 if (request_data.request_body) { | 969 if (request_data.request_body) { |
| 970 request->set_upload(make_scoped_ptr( | 970 request->set_upload(make_scoped_ptr( |
| 971 request_data.request_body->ResolveElementsAndCreateUploadDataStream( | 971 request_data.request_body->ResolveElementsAndCreateUploadDataStream( |
| 972 filter_->blob_storage_context()->controller(), | 972 filter_->blob_storage_context()->controller(), |
| 973 filter_->file_system_context(), | 973 filter_->file_system_context(), |
| 974 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)))); | 974 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE)))); |
| 975 } | 975 } |
| 976 | 976 |
| (...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1753 DelegateMap::iterator it = delegate_map_.find(id); | 1753 DelegateMap::iterator it = delegate_map_.find(id); |
| 1754 DCHECK(it->second->HasObserver(delegate)); | 1754 DCHECK(it->second->HasObserver(delegate)); |
| 1755 it->second->RemoveObserver(delegate); | 1755 it->second->RemoveObserver(delegate); |
| 1756 if (it->second->size() == 0) { | 1756 if (it->second->size() == 0) { |
| 1757 delete it->second; | 1757 delete it->second; |
| 1758 delegate_map_.erase(it); | 1758 delegate_map_.erase(it); |
| 1759 } | 1759 } |
| 1760 } | 1760 } |
| 1761 | 1761 |
| 1762 } // namespace content | 1762 } // namespace content |
| OLD | NEW |