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

Side by Side Diff: content/browser/renderer_host/resource_loader.h

Issue 10644011: Revert r143458 (which re-applies r143341 and r142979). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 | Annotate | Revision Log
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 #ifndef CONTENT_BROWSER_RENDERER_HOST_RESOURCE_LOADER_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_RESOURCE_LOADER_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_RESOURCE_LOADER_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_RESOURCE_LOADER_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "content/browser/renderer_host/resource_handler.h" 10 #include "content/browser/renderer_host/resource_handler.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 void CompleteTransfer(scoped_ptr<ResourceHandler> new_handler); 42 void CompleteTransfer(scoped_ptr<ResourceHandler> new_handler);
43 43
44 net::URLRequest* request() { return request_.get(); } 44 net::URLRequest* request() { return request_.get(); }
45 ResourceRequestInfoImpl* GetRequestInfo(); 45 ResourceRequestInfoImpl* GetRequestInfo();
46 46
47 void ClearLoginDelegate(); 47 void ClearLoginDelegate();
48 void ClearSSLClientAuthHandler(); 48 void ClearSSLClientAuthHandler();
49 49
50 // IPC message handlers: 50 // IPC message handlers:
51 void OnUploadProgressACK(); 51 void OnUploadProgressACK();
52 void OnFollowRedirect(bool has_new_first_party_for_cookies,
53 const GURL& new_first_party_for_cookies);
54 52
55 private: 53 private:
56 // net::URLRequest::Delegate implementation: 54 // net::URLRequest::Delegate implementation:
57 virtual void OnReceivedRedirect(net::URLRequest* request, 55 virtual void OnReceivedRedirect(net::URLRequest* request,
58 const GURL& new_url, 56 const GURL& new_url,
59 bool* defer) OVERRIDE; 57 bool* defer) OVERRIDE;
60 virtual void OnAuthRequired(net::URLRequest* request, 58 virtual void OnAuthRequired(net::URLRequest* request,
61 net::AuthChallengeInfo* info) OVERRIDE; 59 net::AuthChallengeInfo* info) OVERRIDE;
62 virtual void OnCertificateRequested(net::URLRequest* request, 60 virtual void OnCertificateRequested(net::URLRequest* request,
63 net::SSLCertRequestInfo* info) OVERRIDE; 61 net::SSLCertRequestInfo* info) OVERRIDE;
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 // consumer. We are waiting for a notification to complete the transfer, at 120 // consumer. We are waiting for a notification to complete the transfer, at
123 // which point we'll receive a new ResourceHandler. 121 // which point we'll receive a new ResourceHandler.
124 bool is_transferring_; 122 bool is_transferring_;
125 123
126 DISALLOW_COPY_AND_ASSIGN(ResourceLoader); 124 DISALLOW_COPY_AND_ASSIGN(ResourceLoader);
127 }; 125 };
128 126
129 } // namespace content 127 } // namespace content
130 128
131 #endif // CONTENT_BROWSER_RENDERER_HOST_RESOURCE_LOADER_H_ 129 #endif // CONTENT_BROWSER_RENDERER_HOST_RESOURCE_LOADER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698