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

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

Issue 12183030: Revert cross-origin auth prompt blocking. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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
« 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 (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 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 // Prevent third-party content from prompting for login, unless it is 636 // Prevent third-party content from prompting for login, unless it is
637 // a proxy that is trying to authenticate. This is often the foundation 637 // a proxy that is trying to authenticate. This is often the foundation
638 // of a scam to extract credentials for another domain from the user. 638 // of a scam to extract credentials for another domain from the user.
639 if (!auth_info->is_proxy) { 639 if (!auth_info->is_proxy) {
640 HttpAuthResourceType resource_type = 640 HttpAuthResourceType resource_type =
641 HttpAuthResourceTypeOf(loader->request()); 641 HttpAuthResourceTypeOf(loader->request());
642 UMA_HISTOGRAM_ENUMERATION("Net.HttpAuthResource", 642 UMA_HISTOGRAM_ENUMERATION("Net.HttpAuthResource",
643 resource_type, 643 resource_type,
644 HTTP_AUTH_RESOURCE_LAST); 644 HTTP_AUTH_RESOURCE_LAST);
645 645
646 if (resource_type == HTTP_AUTH_RESOURCE_BLOCKED_CROSS) 646 // TODO(tsepez): someday return false on HTTP_AUTH_RESOURCE_BLOCKED_CROSS,
647 return false; 647 // but not now since the issues in http://crbug.com/174129 keep getting
Charlie Reis 2013/02/04 23:31:40 This took me a while to understand. Can you say a
648 // re-introduced.
648 } 649 }
649 650
650 return true; 651 return true;
651 } 652 }
652 653
653 bool ResourceDispatcherHostImpl::AcceptSSLClientCertificateRequest( 654 bool ResourceDispatcherHostImpl::AcceptSSLClientCertificateRequest(
654 ResourceLoader* loader, 655 ResourceLoader* loader,
655 net::SSLCertRequestInfo* cert_info) { 656 net::SSLCertRequestInfo* cert_info) {
656 if (delegate_ && !delegate_->AcceptSSLClientCertificateRequest( 657 if (delegate_ && !delegate_->AcceptSSLClientCertificateRequest(
657 loader->request(), cert_info)) { 658 loader->request(), cert_info)) {
(...skipping 1074 matching lines...) Expand 10 before | Expand all | Expand 10 after
1732 1733
1733 return i->second.get(); 1734 return i->second.get();
1734 } 1735 }
1735 1736
1736 ResourceLoader* ResourceDispatcherHostImpl::GetLoader(int child_id, 1737 ResourceLoader* ResourceDispatcherHostImpl::GetLoader(int child_id,
1737 int request_id) const { 1738 int request_id) const {
1738 return GetLoader(GlobalRequestID(child_id, request_id)); 1739 return GetLoader(GlobalRequestID(child_id, request_id));
1739 } 1740 }
1740 1741
1741 } // namespace content 1742 } // 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