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

Side by Side Diff: content/common/navigation_params.h

Issue 1157373002: Revert of Fix the commit type for out-of-process iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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/common/frame_messages.h ('k') | content/common/navigation_params.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_COMMON_NAVIGATION_PARAMS_H_ 5 #ifndef CONTENT_COMMON_NAVIGATION_PARAMS_H_
6 #define CONTENT_COMMON_NAVIGATION_PARAMS_H_ 6 #define CONTENT_COMMON_NAVIGATION_PARAMS_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 struct CONTENT_EXPORT RequestNavigationParams { 163 struct CONTENT_EXPORT RequestNavigationParams {
164 RequestNavigationParams(); 164 RequestNavigationParams();
165 RequestNavigationParams(bool is_overriding_user_agent, 165 RequestNavigationParams(bool is_overriding_user_agent,
166 base::TimeTicks navigation_start, 166 base::TimeTicks navigation_start,
167 const std::vector<GURL>& redirects, 167 const std::vector<GURL>& redirects,
168 bool can_load_local_resources, 168 bool can_load_local_resources,
169 base::Time request_time, 169 base::Time request_time,
170 const PageState& page_state, 170 const PageState& page_state,
171 int32 page_id, 171 int32 page_id,
172 int nav_entry_id, 172 int nav_entry_id,
173 bool has_committed_real_load,
174 bool intended_as_new_entry, 173 bool intended_as_new_entry,
175 int pending_history_list_offset, 174 int pending_history_list_offset,
176 int current_history_list_offset, 175 int current_history_list_offset,
177 int current_history_list_length, 176 int current_history_list_length,
178 bool should_clear_history_list); 177 bool should_clear_history_list);
179 ~RequestNavigationParams(); 178 ~RequestNavigationParams();
180 179
181 // Whether or not the user agent override string should be used. 180 // Whether or not the user agent override string should be used.
182 bool is_overriding_user_agent; 181 bool is_overriding_user_agent;
183 182
(...skipping 21 matching lines...) Expand all
205 // succeeds, then this page_id will be reflected in the resultant 204 // succeeds, then this page_id will be reflected in the resultant
206 // FrameHostMsg_DidCommitProvisionalLoad message. 205 // FrameHostMsg_DidCommitProvisionalLoad message.
207 int32 page_id; 206 int32 page_id;
208 207
209 // For browser-initiated navigations, this is the unique id of the 208 // For browser-initiated navigations, this is the unique id of the
210 // NavigationEntry being navigated to. (For renderer-initiated navigations it 209 // NavigationEntry being navigated to. (For renderer-initiated navigations it
211 // is 0.) If the load succeeds, then this nav_entry_id will be reflected in 210 // is 0.) If the load succeeds, then this nav_entry_id will be reflected in
212 // the resulting FrameHostMsg_DidCommitProvisionalLoad message. 211 // the resulting FrameHostMsg_DidCommitProvisionalLoad message.
213 int nav_entry_id; 212 int nav_entry_id;
214 213
215 // Whether the frame being navigated has already committed a real page, which
216 // affects how new navigations are classified in the renderer process.
217 // This currently is only ever set to true in --site-per-process mode.
218 // TODO(creis): Create FrameNavigationEntries by default so this always works.
219 bool has_committed_real_load;
220
221 // For browser-initiated navigations, this is true if this is a new entry 214 // For browser-initiated navigations, this is true if this is a new entry
222 // being navigated to. This is false otherwise. TODO(avi): Remove this when 215 // being navigated to. This is false otherwise. TODO(avi): Remove this when
223 // the pending entry situation is made sane and the browser keeps them around 216 // the pending entry situation is made sane and the browser keeps them around
224 // long enough to match them via nav_entry_id, above. 217 // long enough to match them via nav_entry_id, above.
225 bool intended_as_new_entry; 218 bool intended_as_new_entry;
226 219
227 // For history navigations, this is the offset in the history list of the 220 // For history navigations, this is the offset in the history list of the
228 // pending load. For non-history navigations, this will be ignored. 221 // pending load. For non-history navigations, this will be ignored.
229 int pending_history_list_offset; 222 int pending_history_list_offset;
230 223
(...skipping 17 matching lines...) Expand all
248 ~NavigationParams(); 241 ~NavigationParams();
249 242
250 CommonNavigationParams common_params; 243 CommonNavigationParams common_params;
251 StartNavigationParams start_params; 244 StartNavigationParams start_params;
252 RequestNavigationParams request_params; 245 RequestNavigationParams request_params;
253 }; 246 };
254 247
255 } // namespace content 248 } // namespace content
256 249
257 #endif // CONTENT_COMMON_NAVIGATION_PARAMS_H_ 250 #endif // CONTENT_COMMON_NAVIGATION_PARAMS_H_
OLDNEW
« no previous file with comments | « content/common/frame_messages.h ('k') | content/common/navigation_params.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698