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

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

Issue 941113002: Pass FrameTreeNode (not RenderFrameHost) to NavigateToEntry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix style Created 5 years, 10 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/browser/frame_host/navigator.cc ('k') | 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/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) 44 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params)
45 override; 45 override;
46 void DidFailLoadWithError(RenderFrameHostImpl* render_frame_host, 46 void DidFailLoadWithError(RenderFrameHostImpl* render_frame_host,
47 const GURL& url, 47 const GURL& url,
48 int error_code, 48 int error_code,
49 const base::string16& error_description) override; 49 const base::string16& error_description) override;
50 void DidNavigate(RenderFrameHostImpl* render_frame_host, 50 void DidNavigate(RenderFrameHostImpl* render_frame_host,
51 const FrameHostMsg_DidCommitProvisionalLoad_Params& 51 const FrameHostMsg_DidCommitProvisionalLoad_Params&
52 input_params) override; 52 input_params) override;
53 bool NavigateToPendingEntry( 53 bool NavigateToPendingEntry(
54 RenderFrameHostImpl* render_frame_host, 54 FrameTreeNode* frame_tree_node,
55 NavigationController::ReloadType reload_type) override; 55 NavigationController::ReloadType reload_type) override;
56 void RequestOpenURL(RenderFrameHostImpl* render_frame_host, 56 void RequestOpenURL(RenderFrameHostImpl* render_frame_host,
57 const GURL& url, 57 const GURL& url,
58 SiteInstance* source_site_instance, 58 SiteInstance* source_site_instance,
59 const Referrer& referrer, 59 const Referrer& referrer,
60 WindowOpenDisposition disposition, 60 WindowOpenDisposition disposition,
61 bool should_replace_current_entry, 61 bool should_replace_current_entry,
62 bool user_gesture) override; 62 bool user_gesture) override;
63 void RequestTransferURL(RenderFrameHostImpl* render_frame_host, 63 void RequestTransferURL(RenderFrameHostImpl* render_frame_host,
64 const GURL& url, 64 const GURL& url,
(...skipping 29 matching lines...) Expand all
94 private: 94 private:
95 // Holds data used to track browser side navigation metrics. 95 // Holds data used to track browser side navigation metrics.
96 struct NavigationMetricsData; 96 struct NavigationMetricsData;
97 97
98 friend class NavigatorTestWithBrowserSideNavigation; 98 friend class NavigatorTestWithBrowserSideNavigation;
99 ~NavigatorImpl() override; 99 ~NavigatorImpl() override;
100 100
101 // Navigates to the given entry, which must be the pending entry. Private 101 // Navigates to the given entry, which must be the pending entry. Private
102 // because all callers should use NavigateToPendingEntry. 102 // because all callers should use NavigateToPendingEntry.
103 bool NavigateToEntry( 103 bool NavigateToEntry(
104 RenderFrameHostImpl* render_frame_host, 104 FrameTreeNode* frame_tree_node,
105 const NavigationEntryImpl& entry, 105 const NavigationEntryImpl& entry,
106 NavigationController::ReloadType reload_type); 106 NavigationController::ReloadType reload_type);
107 107
108 bool ShouldAssignSiteForURL(const GURL& url); 108 bool ShouldAssignSiteForURL(const GURL& url);
109 109
110 void CheckWebUIRendererDoesNotDisplayNormalURL( 110 void CheckWebUIRendererDoesNotDisplayNormalURL(
111 RenderFrameHostImpl* render_frame_host, 111 RenderFrameHostImpl* render_frame_host,
112 const GURL& url); 112 const GURL& url);
113 113
114 // PlzNavigate: if needed, sends a BeforeUnload IPC to the renderer to ask it 114 // PlzNavigate: if needed, sends a BeforeUnload IPC to the renderer to ask it
(...skipping 29 matching lines...) Expand all
144 // different FrameTreeNodes, based on the frame_tree_node_id. 144 // different FrameTreeNodes, based on the frame_tree_node_id.
145 typedef base::ScopedPtrHashMap<int64, NavigationRequest> NavigationRequestMap; 145 typedef base::ScopedPtrHashMap<int64, NavigationRequest> NavigationRequestMap;
146 NavigationRequestMap navigation_request_map_; 146 NavigationRequestMap navigation_request_map_;
147 147
148 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl); 148 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl);
149 }; 149 };
150 150
151 } // namespace content 151 } // namespace content
152 152
153 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ 153 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigator.cc ('k') | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698