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

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

Issue 1777903003: Ensure the NavigationHandle's nav entry ID is updated during transfers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move fix to another CL (now cleanup only) Created 4 years, 9 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_CONTROLLER_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 // whether any frame successfully started a navigation. 251 // whether any frame successfully started a navigation.
252 bool NavigateToPendingEntryInternal(ReloadType reload_type); 252 bool NavigateToPendingEntryInternal(ReloadType reload_type);
253 253
254 // Recursively identifies which frames need to be navigated for the pending 254 // Recursively identifies which frames need to be navigated for the pending
255 // NavigationEntry, starting at |frame| and exploring its children. Only used 255 // NavigationEntry, starting at |frame| and exploring its children. Only used
256 // in --site-per-process. 256 // in --site-per-process.
257 void FindFramesToNavigate(FrameTreeNode* frame, 257 void FindFramesToNavigate(FrameTreeNode* frame,
258 FrameLoadVector* sameDocumentLoads, 258 FrameLoadVector* sameDocumentLoads,
259 FrameLoadVector* differentDocumentLoads); 259 FrameLoadVector* differentDocumentLoads);
260 260
261 // Returns whether there is a pending NavigationEntry whose unique ID matches
262 // the given NavigationHandle's pending_nav_entry_id.
263 bool PendingEntryMatchesHandle(NavigationHandleImpl* handle) const;
264
261 // Classifies the given renderer navigation (see the NavigationType enum). 265 // Classifies the given renderer navigation (see the NavigationType enum).
262 NavigationType ClassifyNavigation( 266 NavigationType ClassifyNavigation(
263 RenderFrameHostImpl* rfh, 267 RenderFrameHostImpl* rfh,
264 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) const; 268 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) const;
265 269
266 // Handlers for the different types of navigation types. They will actually 270 // Handlers for the different types of navigation types. They will actually
267 // handle the navigations corresponding to the different NavClasses above. 271 // handle the navigations corresponding to the different NavClasses above.
268 // They will NOT broadcast the commit notification, that should be handled by 272 // They will NOT broadcast the commit notification, that should be handled by
269 // the caller. 273 // the caller.
270 // 274 //
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 TimeSmoother time_smoother_; 450 TimeSmoother time_smoother_;
447 451
448 scoped_ptr<NavigationEntryScreenshotManager> screenshot_manager_; 452 scoped_ptr<NavigationEntryScreenshotManager> screenshot_manager_;
449 453
450 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl); 454 DISALLOW_COPY_AND_ASSIGN(NavigationControllerImpl);
451 }; 455 };
452 456
453 } // namespace content 457 } // namespace content
454 458
455 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_ 459 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_CONTROLLER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698