OLD | NEW |
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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 RenderFrameHostImpl* render_frame_host, |
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 const Referrer& referrer, | 59 const Referrer& referrer, |
59 WindowOpenDisposition disposition, | 60 WindowOpenDisposition disposition, |
60 bool should_replace_current_entry, | 61 bool should_replace_current_entry, |
61 bool user_gesture) override; | 62 bool user_gesture) override; |
62 void RequestTransferURL(RenderFrameHostImpl* render_frame_host, | 63 void RequestTransferURL(RenderFrameHostImpl* render_frame_host, |
63 const GURL& url, | 64 const GURL& url, |
| 65 SiteInstance* source_site_instance, |
64 const std::vector<GURL>& redirect_chain, | 66 const std::vector<GURL>& redirect_chain, |
65 const Referrer& referrer, | 67 const Referrer& referrer, |
66 ui::PageTransition page_transition, | 68 ui::PageTransition page_transition, |
67 WindowOpenDisposition disposition, | 69 WindowOpenDisposition disposition, |
68 const GlobalRequestID& transferred_global_request_id, | 70 const GlobalRequestID& transferred_global_request_id, |
69 bool should_replace_current_entry, | 71 bool should_replace_current_entry, |
70 bool user_gesture) override; | 72 bool user_gesture) override; |
71 void OnBeginNavigation(FrameTreeNode* frame_tree_node, | 73 void OnBeginNavigation(FrameTreeNode* frame_tree_node, |
72 const FrameHostMsg_BeginNavigation_Params& params, | 74 const FrameHostMsg_BeginNavigation_Params& params, |
73 const CommonNavigationParams& common_params) override; | 75 const CommonNavigationParams& common_params) override; |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 // different FrameTreeNodes, based on the frame_tree_node_id. | 137 // different FrameTreeNodes, based on the frame_tree_node_id. |
136 typedef base::ScopedPtrHashMap<int64, NavigationRequest> NavigationRequestMap; | 138 typedef base::ScopedPtrHashMap<int64, NavigationRequest> NavigationRequestMap; |
137 NavigationRequestMap navigation_request_map_; | 139 NavigationRequestMap navigation_request_map_; |
138 | 140 |
139 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl); | 141 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl); |
140 }; | 142 }; |
141 | 143 |
142 } // namespace content | 144 } // namespace content |
143 | 145 |
144 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ | 146 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ |
OLD | NEW |