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

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

Issue 10640019: Remove the HANDLED_EXTERNALLY status code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed some minor issues Created 8 years, 6 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
OLDNEW
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/renderer_host/resource_dispatcher_host_impl.h" 7 #include "content/browser/renderer_host/resource_dispatcher_host_impl.h"
8 8
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 #define NET_ERROR(label, value) -(value), 118 #define NET_ERROR(label, value) -(value),
119 #include "net/base/net_error_list.h" 119 #include "net/base/net_error_list.h"
120 #undef NET_ERROR 120 #undef NET_ERROR
121 }; 121 };
122 122
123 // Aborts a request before an URLRequest has actually been created. 123 // Aborts a request before an URLRequest has actually been created.
124 void AbortRequestBeforeItStarts(ResourceMessageFilter* filter, 124 void AbortRequestBeforeItStarts(ResourceMessageFilter* filter,
125 IPC::Message* sync_result, 125 IPC::Message* sync_result,
126 int route_id, 126 int route_id,
127 int request_id) { 127 int request_id) {
128 net::URLRequestStatus status(net::URLRequestStatus::FAILED,
129 net::ERR_ABORTED);
130 if (sync_result) { 128 if (sync_result) {
131 SyncLoadResult result; 129 SyncLoadResult result;
132 result.status = status; 130 result.error_code = net::ERR_ABORTED;
133 ResourceHostMsg_SyncLoad::WriteReplyParams(sync_result, result); 131 ResourceHostMsg_SyncLoad::WriteReplyParams(sync_result, result);
134 filter->Send(sync_result); 132 filter->Send(sync_result);
135 } else { 133 } else {
136 // Tell the renderer that this request was disallowed. 134 // Tell the renderer that this request was disallowed.
137 filter->Send(new ResourceMsg_RequestComplete( 135 filter->Send(new ResourceMsg_RequestComplete(
138 route_id, 136 route_id,
139 request_id, 137 request_id,
140 status, 138 net::ERR_ABORTED,
141 std::string(), // No security info needed, connection not established. 139 std::string(), // No security info needed, connection not established.
142 base::TimeTicks())); 140 base::TimeTicks()));
143 } 141 }
144 } 142 }
145 143
146 GURL MaybeStripReferrer(const GURL& possible_referrer) { 144 GURL MaybeStripReferrer(const GURL& possible_referrer) {
147 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoReferrers)) 145 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoReferrers))
148 return GURL(); 146 return GURL();
149 return possible_referrer; 147 return possible_referrer;
150 } 148 }
(...skipping 1565 matching lines...) Expand 10 before | Expand all | Expand 10 after
1716 1714
1717 return i->second.get(); 1715 return i->second.get();
1718 } 1716 }
1719 1717
1720 ResourceLoader* ResourceDispatcherHostImpl::GetLoader(int child_id, 1718 ResourceLoader* ResourceDispatcherHostImpl::GetLoader(int child_id,
1721 int request_id) const { 1719 int request_id) const {
1722 return GetLoader(GlobalRequestID(child_id, request_id)); 1720 return GetLoader(GlobalRequestID(child_id, request_id));
1723 } 1721 }
1724 1722
1725 } // namespace content 1723 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698