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

Side by Side Diff: content/child/web_url_request_util.cc

Issue 809103003: Revert of Map WebURLRequest::RequestContextPlugin to RESOURCE_TYPE_OBJECT. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "content/child/web_url_request_util.h" 5 #include "content/child/web_url_request_util.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "net/base/load_flags.h" 9 #include "net/base/load_flags.h"
10 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h" 10 #include "third_party/WebKit/public/platform/WebHTTPHeaderVisitor.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 return RESOURCE_TYPE_IMAGE; 93 return RESOURCE_TYPE_IMAGE;
94 94
95 // Media 95 // Media
96 case WebURLRequest::RequestContextAudio: 96 case WebURLRequest::RequestContextAudio:
97 case WebURLRequest::RequestContextVideo: 97 case WebURLRequest::RequestContextVideo:
98 return RESOURCE_TYPE_MEDIA; 98 return RESOURCE_TYPE_MEDIA;
99 99
100 // Object 100 // Object
101 case WebURLRequest::RequestContextEmbed: 101 case WebURLRequest::RequestContextEmbed:
102 case WebURLRequest::RequestContextObject: 102 case WebURLRequest::RequestContextObject:
103 case WebURLRequest::RequestContextPlugin:
104 return RESOURCE_TYPE_OBJECT; 103 return RESOURCE_TYPE_OBJECT;
105 104
106 // Ping 105 // Ping
107 case WebURLRequest::RequestContextBeacon: 106 case WebURLRequest::RequestContextBeacon:
108 case WebURLRequest::RequestContextCSPReport: 107 case WebURLRequest::RequestContextCSPReport:
109 case WebURLRequest::RequestContextPing: 108 case WebURLRequest::RequestContextPing:
110 return RESOURCE_TYPE_PING; 109 return RESOURCE_TYPE_PING;
111 110
112 // Prefetch 111 // Prefetch
113 case WebURLRequest::RequestContextPrefetch: 112 case WebURLRequest::RequestContextPrefetch:
114 return RESOURCE_TYPE_PREFETCH; 113 return RESOURCE_TYPE_PREFETCH;
115 114
116 // Script 115 // Script
117 case WebURLRequest::RequestContextImport: 116 case WebURLRequest::RequestContextImport:
118 case WebURLRequest::RequestContextScript: 117 case WebURLRequest::RequestContextScript:
119 return RESOURCE_TYPE_SCRIPT; 118 return RESOURCE_TYPE_SCRIPT;
120 119
121 // Style 120 // Style
122 case WebURLRequest::RequestContextXSLT: 121 case WebURLRequest::RequestContextXSLT:
123 case WebURLRequest::RequestContextStyle: 122 case WebURLRequest::RequestContextStyle:
124 return RESOURCE_TYPE_STYLESHEET; 123 return RESOURCE_TYPE_STYLESHEET;
125 124
126 // Subresource 125 // Subresource
127 case WebURLRequest::RequestContextDownload: 126 case WebURLRequest::RequestContextDownload:
128 case WebURLRequest::RequestContextManifest: 127 case WebURLRequest::RequestContextManifest:
129 case WebURLRequest::RequestContextSubresource: 128 case WebURLRequest::RequestContextSubresource:
129 case WebURLRequest::RequestContextPlugin:
130 return RESOURCE_TYPE_SUB_RESOURCE; 130 return RESOURCE_TYPE_SUB_RESOURCE;
131 131
132 // TextTrack 132 // TextTrack
133 case WebURLRequest::RequestContextTrack: 133 case WebURLRequest::RequestContextTrack:
134 return RESOURCE_TYPE_MEDIA; 134 return RESOURCE_TYPE_MEDIA;
135 135
136 // Workers 136 // Workers
137 case WebURLRequest::RequestContextServiceWorker: 137 case WebURLRequest::RequestContextServiceWorker:
138 return RESOURCE_TYPE_SERVICE_WORKER; 138 return RESOURCE_TYPE_SERVICE_WORKER;
139 case WebURLRequest::RequestContextSharedWorker: 139 case WebURLRequest::RequestContextSharedWorker:
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 load_flags |= net::LOAD_DO_NOT_SEND_AUTH_DATA; 209 load_flags |= net::LOAD_DO_NOT_SEND_AUTH_DATA;
210 210
211 if (request.requestContext() == WebURLRequest::RequestContextXMLHttpRequest && 211 if (request.requestContext() == WebURLRequest::RequestContextXMLHttpRequest &&
212 (url.has_username() || url.has_password())) { 212 (url.has_username() || url.has_password())) {
213 load_flags |= net::LOAD_DO_NOT_PROMPT_FOR_LOGIN; 213 load_flags |= net::LOAD_DO_NOT_PROMPT_FOR_LOGIN;
214 } 214 }
215 return load_flags; 215 return load_flags;
216 } 216 }
217 217
218 } // namespace content 218 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698