OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #include "content/browser/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 params->current_history_list_offset = -1; | 212 params->current_history_list_offset = -1; |
213 params->current_history_list_length = 0; | 213 params->current_history_list_length = 0; |
214 } else { | 214 } else { |
215 params->pending_history_list_offset = controller.GetIndexOfEntry(&entry); | 215 params->pending_history_list_offset = controller.GetIndexOfEntry(&entry); |
216 params->current_history_list_offset = | 216 params->current_history_list_offset = |
217 controller.GetLastCommittedEntryIndex(); | 217 controller.GetLastCommittedEntryIndex(); |
218 params->current_history_list_length = controller.GetEntryCount(); | 218 params->current_history_list_length = controller.GetEntryCount(); |
219 } | 219 } |
220 params->url = entry.GetURL(); | 220 params->url = entry.GetURL(); |
221 if (!entry.GetBaseURLForDataURL().is_empty()) { | 221 if (!entry.GetBaseURLForDataURL().is_empty()) { |
| 222 params->data_for_data_url = entry.GetDataForDataURL(); |
222 params->base_url_for_data_url = entry.GetBaseURLForDataURL(); | 223 params->base_url_for_data_url = entry.GetBaseURLForDataURL(); |
223 params->history_url_for_data_url = entry.GetVirtualURL(); | 224 params->history_url_for_data_url = entry.GetVirtualURL(); |
224 } | 225 } |
225 params->referrer = entry.GetReferrer(); | 226 params->referrer = entry.GetReferrer(); |
226 params->transition = entry.GetTransitionType(); | 227 params->transition = entry.GetTransitionType(); |
227 params->page_state = entry.GetPageState(); | 228 params->page_state = entry.GetPageState(); |
228 params->navigation_type = | 229 params->navigation_type = |
229 GetNavigationType(controller.GetBrowserContext(), entry, reload_type); | 230 GetNavigationType(controller.GetBrowserContext(), entry, reload_type); |
230 params->request_time = base::Time::Now(); | 231 params->request_time = base::Time::Now(); |
231 params->extra_headers = entry.extra_headers(); | 232 params->extra_headers = entry.extra_headers(); |
(...skipping 3462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3694 } | 3695 } |
3695 | 3696 |
3696 void WebContentsImpl::OnFrameRemoved( | 3697 void WebContentsImpl::OnFrameRemoved( |
3697 RenderViewHostImpl* render_view_host, | 3698 RenderViewHostImpl* render_view_host, |
3698 int64 frame_id) { | 3699 int64 frame_id) { |
3699 FOR_EACH_OBSERVER(WebContentsObserver, observers_, | 3700 FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
3700 FrameDetached(render_view_host, frame_id)); | 3701 FrameDetached(render_view_host, frame_id)); |
3701 } | 3702 } |
3702 | 3703 |
3703 } // namespace content | 3704 } // namespace content |
OLD | NEW |