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/macros.h" | 9 #include "base/macros.h" |
10 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
128 | 128 |
129 void RecordNavigationMetrics( | 129 void RecordNavigationMetrics( |
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 NavigationHandleImpl* navigation_handle); |
139 | 140 |
140 // The NavigationController that will keep track of session history for all | 141 // The NavigationController that will keep track of session history for all |
141 // RenderFrameHost objects using this NavigatorImpl. | 142 // RenderFrameHost objects using this NavigatorImpl. |
142 // TODO(nasko): Move ownership of the NavigationController from | 143 // TODO(nasko): Move ownership of the NavigationController from |
143 // WebContentsImpl to this class. | 144 // WebContentsImpl to this class. |
144 NavigationControllerImpl* controller_; | 145 NavigationControllerImpl* controller_; |
145 | 146 |
146 // Used to notify the object embedding this Navigator about navigation | 147 // Used to notify the object embedding this Navigator about navigation |
147 // events. Can be NULL in tests. | 148 // events. Can be NULL in tests. |
148 NavigatorDelegate* delegate_; | 149 NavigatorDelegate* delegate_; |
149 | 150 |
150 scoped_ptr<NavigatorImpl::NavigationMetricsData> navigation_data_; | 151 scoped_ptr<NavigatorImpl::NavigationMetricsData> navigation_data_; |
151 | 152 |
152 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl); | 153 DISALLOW_COPY_AND_ASSIGN(NavigatorImpl); |
153 }; | 154 }; |
154 | 155 |
155 } // namespace content | 156 } // namespace content |
156 | 157 |
157 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ | 158 #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_IMPL_H_ |
OLD | NEW |