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

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

Issue 2574063003: Move ResourceHandler deferred actions ahead of external protocol handling. (Closed)
Patch Set: Reverts URLRequest changes; redirect bugfix; improved unit tests. Created 4 years 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
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_LOADER_RESOURCE_LOADER_H_ 5 #ifndef CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_
6 #define CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_ 6 #define CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/callback_forward.h" 10 #include "base/callback_forward.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 void CancelCertificateSelection() override; 76 void CancelCertificateSelection() override;
77 77
78 // ResourceController implementation: 78 // ResourceController implementation:
79 void Resume() override; 79 void Resume() override;
80 void Cancel() override; 80 void Cancel() override;
81 void CancelAndIgnore() override; 81 void CancelAndIgnore() override;
82 void CancelWithError(int error_code) override; 82 void CancelWithError(int error_code) override;
83 83
84 void StartRequestInternal(); 84 void StartRequestInternal();
85 void CancelRequestInternal(int error, bool from_renderer); 85 void CancelRequestInternal(int error, bool from_renderer);
86 void FollowDeferredRedirectInternal();
86 void CompleteResponseStarted(); 87 void CompleteResponseStarted();
87 void ReadMore(bool is_continuation); 88 void ReadMore(bool is_continuation);
88 void ResumeReading(); 89 void ResumeReading();
89 // Passes a read result to the handler. 90 // Passes a read result to the handler.
90 void CompleteRead(int bytes_read); 91 void CompleteRead(int bytes_read);
91 void ResponseCompleted(); 92 void ResponseCompleted();
92 void CallDidFinishLoading(); 93 void CallDidFinishLoading();
93 void RecordHistograms(); 94 void RecordHistograms();
94 95
95 bool is_deferred() const { return deferred_stage_ != DEFERRED_NONE; } 96 bool is_deferred() const { return deferred_stage_ != DEFERRED_NONE; }
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 133
133 // Called when a navigation has finished transfer. 134 // Called when a navigation has finished transfer.
134 base::Closure on_transfer_complete_callback_; 135 base::Closure on_transfer_complete_callback_;
135 136
136 // Instrumentation add to investigate http://crbug.com/503306. 137 // Instrumentation add to investigate http://crbug.com/503306.
137 // TODO(mmenke): Remove once bug is fixed. 138 // TODO(mmenke): Remove once bug is fixed.
138 int times_cancelled_before_request_start_; 139 int times_cancelled_before_request_start_;
139 bool started_request_; 140 bool started_request_;
140 int times_cancelled_after_request_start_; 141 int times_cancelled_after_request_start_;
141 142
143 // Stores the URL from a deferred redirect.
144 GURL deferred_redirect_url_;
mmenke 2016/12/16 16:19:36 need to include url.h
carlosk 2016/12/20 19:23:31 Done.
145
142 base::WeakPtrFactory<ResourceLoader> weak_ptr_factory_; 146 base::WeakPtrFactory<ResourceLoader> weak_ptr_factory_;
143 147
144 DISALLOW_COPY_AND_ASSIGN(ResourceLoader); 148 DISALLOW_COPY_AND_ASSIGN(ResourceLoader);
145 }; 149 };
146 150
147 } // namespace content 151 } // namespace content
148 152
149 #endif // CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_ 153 #endif // CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/loader/resource_loader.cc » ('j') | content/browser/loader/resource_loader.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698