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

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

Issue 2475693002: Do not reset NavigationHandle when navigating same-page (Closed)
Patch Set: Rebase + removed DCHECK Created 4 years, 1 month 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_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 <memory> 8 #include <memory>
9 9
10 #include "base/containers/scoped_ptr_hash_map.h" 10 #include "base/containers/scoped_ptr_hash_map.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 RenderFrameHostImpl* render_frame_host, 49 RenderFrameHostImpl* render_frame_host,
50 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) 50 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params)
51 override; 51 override;
52 void DidFailLoadWithError(RenderFrameHostImpl* render_frame_host, 52 void DidFailLoadWithError(RenderFrameHostImpl* render_frame_host,
53 const GURL& url, 53 const GURL& url,
54 int error_code, 54 int error_code,
55 const base::string16& error_description, 55 const base::string16& error_description,
56 bool was_ignored_by_handler) override; 56 bool was_ignored_by_handler) override;
57 void DidNavigate( 57 void DidNavigate(
58 RenderFrameHostImpl* render_frame_host, 58 RenderFrameHostImpl* render_frame_host,
59 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) override; 59 const FrameHostMsg_DidCommitProvisionalLoad_Params& params,
60 std::unique_ptr<NavigationHandleImpl> navigation_handle) override;
60 bool NavigateToPendingEntry(FrameTreeNode* frame_tree_node, 61 bool NavigateToPendingEntry(FrameTreeNode* frame_tree_node,
61 const FrameNavigationEntry& frame_entry, 62 const FrameNavigationEntry& frame_entry,
62 ReloadType reload_type, 63 ReloadType reload_type,
63 bool is_same_document_history_load) override; 64 bool is_same_document_history_load) override;
64 bool NavigateNewChildFrame(RenderFrameHostImpl* render_frame_host, 65 bool NavigateNewChildFrame(RenderFrameHostImpl* render_frame_host,
65 const GURL& default_url) override; 66 const GURL& default_url) override;
66 void RequestOpenURL(RenderFrameHostImpl* render_frame_host, 67 void RequestOpenURL(RenderFrameHostImpl* render_frame_host,
67 const GURL& url, 68 const GURL& url,
68 bool uses_post, 69 bool uses_post,
69 const scoped_refptr<ResourceRequestBodyImpl>& body, 70 const scoped_refptr<ResourceRequestBodyImpl>& body,
(...skipping 19 matching lines...) Expand all
89 const BeginNavigationParams& begin_params) override; 90 const BeginNavigationParams& begin_params) override;
90 void FailedNavigation(FrameTreeNode* frame_tree_node, 91 void FailedNavigation(FrameTreeNode* frame_tree_node,
91 bool has_stale_copy_in_cache, 92 bool has_stale_copy_in_cache,
92 int error_code) override; 93 int error_code) override;
93 void LogResourceRequestTime(base::TimeTicks timestamp, 94 void LogResourceRequestTime(base::TimeTicks timestamp,
94 const GURL& url) override; 95 const GURL& url) override;
95 void LogBeforeUnloadTime( 96 void LogBeforeUnloadTime(
96 const base::TimeTicks& renderer_before_unload_start_time, 97 const base::TimeTicks& renderer_before_unload_start_time,
97 const base::TimeTicks& renderer_before_unload_end_time) override; 98 const base::TimeTicks& renderer_before_unload_end_time) override;
98 void CancelNavigation(FrameTreeNode* frame_tree_node) override; 99 void CancelNavigation(FrameTreeNode* frame_tree_node) override;
99 NavigationHandleImpl* GetNavigationHandleForFrameHost(
100 RenderFrameHostImpl* render_frame_host) override;
101 void DiscardPendingEntryIfNeeded(NavigationHandleImpl* handle) override; 100 void DiscardPendingEntryIfNeeded(NavigationHandleImpl* handle) override;
102 101
103 private: 102 private:
104 // Holds data used to track browser side navigation metrics. 103 // Holds data used to track browser side navigation metrics.
105 struct NavigationMetricsData; 104 struct NavigationMetricsData;
106 105
107 friend class NavigatorTestWithBrowserSideNavigation; 106 friend class NavigatorTestWithBrowserSideNavigation;
108 ~NavigatorImpl() override; 107 ~NavigatorImpl() override;
109 108
110 // Navigates to the given entry, which might be the pending entry (if 109 // Navigates to the given entry, which might be the pending entry (if
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 NavigatorDelegate* delegate_; 157 NavigatorDelegate* delegate_;
159 158
160 std::unique_ptr<NavigatorImpl::NavigationMetricsData> navigation_data_; 159 std::unique_ptr<NavigatorImpl::NavigationMetricsData> navigation_data_;
161 160
162 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl); 161 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
163 }; 162 };
164 163
165 } // namespace content 164 } // namespace content
166 165
167 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ 166 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698