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

Unified Diff: content/child/web_url_loader_impl.cc

Issue 409583002: Remove 'WebURLRequest::TargetType' from WebURLLoader. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/web_url_loader_impl.cc
diff --git a/content/child/web_url_loader_impl.cc b/content/child/web_url_loader_impl.cc
index 5fe04707bed2d64298d13c550dd4029bed75870e..c410203d798778244a5f3185a953d809071fd1e3 100644
--- a/content/child/web_url_loader_impl.cc
+++ b/content/child/web_url_loader_impl.cc
@@ -366,7 +366,7 @@ void WebURLLoaderImpl::Context::Start(const WebURLRequest& request,
if (!request.allowStoredCredentials())
load_flags |= net::LOAD_DO_NOT_SEND_AUTH_DATA;
- if (request.targetType() == WebURLRequest::TargetIsXHR &&
+ if (request.requestContext() == WebURLRequest::RequestContextXMLHttpRequest &&
(url.has_username() || url.has_password())) {
load_flags |= net::LOAD_DO_NOT_PROMPT_FOR_LOGIN;
}
@@ -672,12 +672,12 @@ bool WebURLLoaderImpl::Context::CanHandleDataURL(const GURL& url) const {
#if defined(OS_ANDROID)
// For compatibility reasons on Android we need to expose top-level data://
// to the browser.
- if (request_.targetType() == WebURLRequest::TargetIsMainFrame)
+ if (request_.frameType() == WebURLRequest::FrameTypeTopLevel)
return false;
#endif
- if (request_.targetType() != WebURLRequest::TargetIsMainFrame &&
- request_.targetType() != WebURLRequest::TargetIsSubframe)
+ if (request_.frameType() != WebURLRequest::FrameTypeTopLevel &&
+ request_.frameType() != WebURLRequest::FrameTypeNested)
return true;
std::string mime_type, unused_charset;
« 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