content/browser/renderer_host/resource_loader.h - Issue 10640019: Remove the HANDLED_EXTERNALLY status code.

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

Issue 10640019: Remove the HANDLED_EXTERNALLY status code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: revert removing DCHECK from URLRequest::DoCancel Created 8 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

« no previous file with comments | « content/browser/renderer_host/resource_dispatcher_host_unittest.cc ('k') | content/browser/renderer_host/resource_loader.cc » ('j') | content/public/browser/resource_controller.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 58 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
69	69

70 // SSLErrorHandler::Delegate implementation:	70 // SSLErrorHandler::Delegate implementation:

71 virtual void CancelSSLRequest(const GlobalRequestID& id,	71 virtual void CancelSSLRequest(const GlobalRequestID& id,

72 int error,	72 int error,

73 const net::SSLInfo* ssl_info) OVERRIDE;	73 const net::SSLInfo* ssl_info) OVERRIDE;

74 virtual void ContinueSSLRequest(const GlobalRequestID& id) OVERRIDE;	74 virtual void ContinueSSLRequest(const GlobalRequestID& id) OVERRIDE;

75	75

76 // ResourceController implementation:	76 // ResourceController implementation:

77 virtual void Resume() OVERRIDE;	77 virtual void Resume() OVERRIDE;

78 virtual void Cancel() OVERRIDE;	78 virtual void Cancel() OVERRIDE;

	79 virtual void CancelWithError(int error) OVERRIDE;

	80 virtual void HandledExternally() OVERRIDE;

79	81

80 void StartRequestInternal();	82 void StartRequestInternal();

81 void CancelRequestInternal(int error, bool from_renderer);	83 void CancelRequestInternal(int error, bool from_renderer);

82 void CompleteResponseStarted();	84 void CompleteResponseStarted();

83 void StartReading(bool is_continuation);	85 void StartReading(bool is_continuation);

84 void ResumeReading();	86 void ResumeReading();

85 void ReadMore(int* bytes_read);	87 void ReadMore(int* bytes_read);

86 void CompleteRead(int bytes_read);	88 void CompleteRead(int bytes_read);

87 void ResponseCompleted();	89 void ResponseCompleted();

88 void CallDidFinishLoading();	90 void CallDidFinishLoading();

(...skipping 24 matching lines...) Expand all Loading...
113 // consumer. We are waiting for a notification to complete the transfer, at	115 // consumer. We are waiting for a notification to complete the transfer, at

114 // which point we'll receive a new ResourceHandler.	116 // which point we'll receive a new ResourceHandler.

115 bool is_transferring_;	117 bool is_transferring_;

116	118

117 DISALLOW_COPY_AND_ASSIGN(ResourceLoader);	119 DISALLOW_COPY_AND_ASSIGN(ResourceLoader);

118 };	120 };

119	121

120 } // namespace content	122 } // namespace content

121	123

122 #endif // CONTENT_BROWSER_RENDERER_HOST_RESOURCE_LOADER_H_	124 #endif // CONTENT_BROWSER_RENDERER_HOST_RESOURCE_LOADER_H_

OLD	NEW