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

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

Issue 1697563002: PlzNavigate: clear pending entry on aborted navigations (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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
« no previous file with comments | « no previous file | content/browser/frame_host/navigator_impl.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 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_NAVIGATOR_IMPL_H_ 5 #ifndef CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ 6 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
7 7
8 #include "base/containers/scoped_ptr_hash_map.h" 8 #include "base/containers/scoped_ptr_hash_map.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 const LoadCommittedDetails& details, 130 const LoadCommittedDetails& details,
131 const FrameHostMsg_DidCommitProvisionalLoad_Params& params, 131 const FrameHostMsg_DidCommitProvisionalLoad_Params& params,
132 SiteInstance* site_instance); 132 SiteInstance* site_instance);
133 133
134 // Called when a navigation has started in a main frame, to update the pending 134 // Called when a navigation has started in a main frame, to update the pending
135 // NavigationEntry if the controller does not currently have a 135 // NavigationEntry if the controller does not currently have a
136 // browser-initiated one. 136 // browser-initiated one.
137 void DidStartMainFrameNavigation(const GURL& url, 137 void DidStartMainFrameNavigation(const GURL& url,
138 SiteInstanceImpl* site_instance); 138 SiteInstanceImpl* site_instance);
139 139
140 // Called when a navigation has failed to discard the pending entry in order
141 // to avoid url spoofs.
142 void DiscardPendingEntryOnFailureIfNeeded(NavigationHandleImpl* handle);
143
140 // The NavigationController that will keep track of session history for all 144 // The NavigationController that will keep track of session history for all
141 // RenderFrameHost objects using this NavigatorImpl. 145 // RenderFrameHost objects using this NavigatorImpl.
142 // TODO(nasko): Move ownership of the NavigationController from 146 // TODO(nasko): Move ownership of the NavigationController from
143 // WebContentsImpl to this class. 147 // WebContentsImpl to this class.
144 NavigationControllerImpl* controller_; 148 NavigationControllerImpl* controller_;
145 149
146 // Used to notify the object embedding this Navigator about navigation 150 // Used to notify the object embedding this Navigator about navigation
147 // events. Can be NULL in tests. 151 // events. Can be NULL in tests.
148 NavigatorDelegate* delegate_; 152 NavigatorDelegate* delegate_;
149 153
150 scoped_ptr<NavigatorImpl::NavigationMetricsData> navigation_data_; 154 scoped_ptr<NavigatorImpl::NavigationMetricsData> navigation_data_;
151 155
152 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl); 156 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
153 }; 157 };
154 158
155 } // namespace content 159 } // namespace content
156 160
157 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ 161 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698