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

Side by Side Diff: chrome/browser/renderer_host/resource_dispatcher_host.h

Issue 173049: Revert r23616 from 172. (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/branches/172/src/
Patch Set: Created 11 years, 4 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
Property Changes:
Modified: svn:mergeinfo
Reverse-merged /trunk/src/chrome/browser/renderer_host/resource_dispatcher_host.h:r14162,14665,15308,15810,15884,15899,15950,16015,16808,18093,18210,18321,18640,18871,19044,19586,19692,19978,19995,21417,22284
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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 // This is the browser side of the resource dispatcher, it receives requests 5 // This is the browser side of the resource dispatcher, it receives requests
6 // from the child process (i.e. [Renderer, Plugin, Worker]ProcessHost), and 6 // from the child process (i.e. [Renderer, Plugin, Worker]ProcessHost), and
7 // dispatches them to URLRequests. It then fowards the messages from the 7 // dispatches them to URLRequests. It then fowards the messages from the
8 // URLRequests back to the correct process for handling. 8 // URLRequests back to the correct process for handling.
9 // 9 //
10 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading 10 // See http://dev.chromium.org/developers/design-documents/multi-process-resourc e-loading
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 299
300 // Force cancels any pending requests for the given process. 300 // Force cancels any pending requests for the given process.
301 void CancelRequestsForProcess(int process_id); 301 void CancelRequestsForProcess(int process_id);
302 302
303 // Force cancels any pending requests for the given route id. This method 303 // Force cancels any pending requests for the given route id. This method
304 // acts like CancelRequestsForProcess when route_id is -1. 304 // acts like CancelRequestsForProcess when route_id is -1.
305 void CancelRequestsForRoute(int process_id, int route_id); 305 void CancelRequestsForRoute(int process_id, int route_id);
306 306
307 // URLRequest::Delegate 307 // URLRequest::Delegate
308 virtual void OnReceivedRedirect(URLRequest* request, 308 virtual void OnReceivedRedirect(URLRequest* request,
309 const GURL& new_url, 309 const GURL& new_url);
310 bool* defer_redirect);
311 virtual void OnAuthRequired(URLRequest* request, 310 virtual void OnAuthRequired(URLRequest* request,
312 net::AuthChallengeInfo* auth_info); 311 net::AuthChallengeInfo* auth_info);
313 virtual void OnSSLCertificateError(URLRequest* request, 312 virtual void OnSSLCertificateError(URLRequest* request,
314 int cert_error, 313 int cert_error,
315 net::X509Certificate* cert); 314 net::X509Certificate* cert);
316 virtual void OnResponseStarted(URLRequest* request); 315 virtual void OnResponseStarted(URLRequest* request);
317 virtual void OnReadCompleted(URLRequest* request, int bytes_read); 316 virtual void OnReadCompleted(URLRequest* request, int bytes_read);
318 void OnResponseCompleted(URLRequest* request); 317 void OnResponseCompleted(URLRequest* request);
319 318
320 // Helper function to get our extra data out of a request. The given request 319 // Helper function to get our extra data out of a request. The given request
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 int max_outstanding_requests_cost_per_process_; 555 int max_outstanding_requests_cost_per_process_;
557 556
558 // Used during IPC message dispatching so that the handlers can get a pointer 557 // Used during IPC message dispatching so that the handlers can get a pointer
559 // to the source of the message. 558 // to the source of the message.
560 Receiver* receiver_; 559 Receiver* receiver_;
561 560
562 DISALLOW_COPY_AND_ASSIGN(ResourceDispatcherHost); 561 DISALLOW_COPY_AND_ASSIGN(ResourceDispatcherHost);
563 }; 562 };
564 563
565 #endif // CHROME_BROWSER_RENDERER_HOST_RESOURCE_DISPATCHER_HOST_H_ 564 #endif // CHROME_BROWSER_RENDERER_HOST_RESOURCE_DISPATCHER_HOST_H_
OLDNEW
« no previous file with comments | « chrome/browser/plugin_process_host.cc ('k') | chrome/browser/renderer_host/resource_dispatcher_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698