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

Side by Side Diff: content/browser/frame_host/navigation_request.h

Issue 2225343002: Navigation: move RestoreType and ReloadType into a separate file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: [rebase] Created 4 years, 3 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_FRAME_HOST_NAVIGATION_REQUEST_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_
6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 FrameTreeNode* frame_tree_node() const { return frame_tree_node_; } 116 FrameTreeNode* frame_tree_node() const { return frame_tree_node_; }
117 117
118 SiteInstanceImpl* source_site_instance() const { 118 SiteInstanceImpl* source_site_instance() const {
119 return source_site_instance_.get(); 119 return source_site_instance_.get();
120 } 120 }
121 121
122 SiteInstanceImpl* dest_site_instance() const { 122 SiteInstanceImpl* dest_site_instance() const {
123 return dest_site_instance_.get(); 123 return dest_site_instance_.get();
124 } 124 }
125 125
126 NavigationEntryImpl::RestoreType restore_type() const { 126 RestoreType restore_type() const { return restore_type_; };
127 return restore_type_;
128 };
129 127
130 bool is_view_source() const { return is_view_source_; }; 128 bool is_view_source() const { return is_view_source_; };
131 129
132 int bindings() const { return bindings_; }; 130 int bindings() const { return bindings_; };
133 131
134 bool browser_initiated() const { return browser_initiated_ ; } 132 bool browser_initiated() const { return browser_initiated_ ; }
135 133
136 void SetWaitingForRendererResponse() { 134 void SetWaitingForRendererResponse() {
137 DCHECK(state_ == NOT_STARTED); 135 DCHECK(state_ == NOT_STARTED);
138 state_ = WAITING_FOR_RENDERER_RESPONSE; 136 state_ = WAITING_FOR_RENDERER_RESPONSE;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 // |info_| after calling BeginNavigation. 215 // |info_| after calling BeginNavigation.
218 std::unique_ptr<NavigationRequestInfo> info_; 216 std::unique_ptr<NavigationRequestInfo> info_;
219 217
220 std::unique_ptr<NavigationURLLoader> loader_; 218 std::unique_ptr<NavigationURLLoader> loader_;
221 219
222 // These next items are used in browser-initiated navigations to store 220 // These next items are used in browser-initiated navigations to store
223 // information from the NavigationEntryImpl that is required after request 221 // information from the NavigationEntryImpl that is required after request
224 // creation time. 222 // creation time.
225 scoped_refptr<SiteInstanceImpl> source_site_instance_; 223 scoped_refptr<SiteInstanceImpl> source_site_instance_;
226 scoped_refptr<SiteInstanceImpl> dest_site_instance_; 224 scoped_refptr<SiteInstanceImpl> dest_site_instance_;
227 NavigationEntryImpl::RestoreType restore_type_; 225 RestoreType restore_type_;
228 bool is_view_source_; 226 bool is_view_source_;
229 int bindings_; 227 int bindings_;
230 228
231 // The type of SiteInstance associated with this navigation. 229 // The type of SiteInstance associated with this navigation.
232 AssociatedSiteInstanceType associated_site_instance_type_; 230 AssociatedSiteInstanceType associated_site_instance_type_;
233 231
234 std::unique_ptr<NavigationHandleImpl> navigation_handle_; 232 std::unique_ptr<NavigationHandleImpl> navigation_handle_;
235 233
236 // Holds the ResourceResponse and the StreamHandle for the navigation while 234 // Holds the ResourceResponse and the StreamHandle for the navigation while
237 // the WillProcessResponse checks are performed by the NavigationHandle. 235 // the WillProcessResponse checks are performed by the NavigationHandle.
238 scoped_refptr<ResourceResponse> response_; 236 scoped_refptr<ResourceResponse> response_;
239 std::unique_ptr<StreamHandle> body_; 237 std::unique_ptr<StreamHandle> body_;
240 238
241 DISALLOW_COPY_AND_ASSIGN(NavigationRequest); 239 DISALLOW_COPY_AND_ASSIGN(NavigationRequest);
242 }; 240 };
243 241
244 } // namespace content 242 } // namespace content
245 243
246 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_ 244 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_entry_impl_unittest.cc ('k') | content/browser/frame_host/navigation_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698