Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 142 void set_associated_site_instance_type(AssociatedSiteInstanceType type) { | 142 void set_associated_site_instance_type(AssociatedSiteInstanceType type) { |
| 143 associated_site_instance_type_ = type; | 143 associated_site_instance_type_ = type; |
| 144 } | 144 } |
| 145 | 145 |
| 146 NavigationHandleImpl* navigation_handle() const { | 146 NavigationHandleImpl* navigation_handle() const { |
| 147 return navigation_handle_.get(); | 147 return navigation_handle_.get(); |
| 148 } | 148 } |
| 149 | 149 |
| 150 // Creates a NavigationHandle. This should be called after any previous | 150 // Creates a NavigationHandle. This should be called after any previous |
| 151 // NavigationRequest for the FrameTreeNode has been destroyed. | 151 // NavigationRequest for the FrameTreeNode has been destroyed. |
| 152 void CreateNavigationHandle(int pending_nav_entry_id); | 152 void CreateNavigationHandle(bool is_renderer_initiated, |
|
clamy
2016/05/12 04:04:44
Navigation request already has a boolean browser_i
dominickn
2016/05/12 04:22:58
Done.
| |
| 153 int pending_nav_entry_id); | |
| 153 | 154 |
| 154 // Transfers the ownership of the NavigationHandle to |render_frame_host|. | 155 // Transfers the ownership of the NavigationHandle to |render_frame_host|. |
| 155 // This should be called when the navigation is ready to commit, because the | 156 // This should be called when the navigation is ready to commit, because the |
| 156 // NavigationHandle outlives the NavigationRequest. The NavigationHandle's | 157 // NavigationHandle outlives the NavigationRequest. The NavigationHandle's |
| 157 // lifetime is the entire navigation, while the NavigationRequest is | 158 // lifetime is the entire navigation, while the NavigationRequest is |
| 158 // destroyed when a navigation is ready for commit. | 159 // destroyed when a navigation is ready for commit. |
| 159 void TransferNavigationHandleOwnership( | 160 void TransferNavigationHandleOwnership( |
| 160 RenderFrameHostImpl* render_frame_host); | 161 RenderFrameHostImpl* render_frame_host); |
| 161 | 162 |
| 162 private: | 163 private: |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 235 // the WillProcessResponse checks are performed by the NavigationHandle. | 236 // the WillProcessResponse checks are performed by the NavigationHandle. |
| 236 scoped_refptr<ResourceResponse> response_; | 237 scoped_refptr<ResourceResponse> response_; |
| 237 std::unique_ptr<StreamHandle> body_; | 238 std::unique_ptr<StreamHandle> body_; |
| 238 | 239 |
| 239 DISALLOW_COPY_AND_ASSIGN(NavigationRequest); | 240 DISALLOW_COPY_AND_ASSIGN(NavigationRequest); |
| 240 }; | 241 }; |
| 241 | 242 |
| 242 } // namespace content | 243 } // namespace content |
| 243 | 244 |
| 244 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_ | 245 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_REQUEST_H_ |
| OLD | NEW |