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/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
208 content::WebContentsDelegate* delegate, | 208 content::WebContentsDelegate* delegate, |
209 NavigationController::ReloadType reload_type, | 209 NavigationController::ReloadType reload_type, |
210 const std::string& embedder_channel_name, | 210 const std::string& embedder_channel_name, |
211 int embedder_container_id, | 211 int embedder_container_id, |
212 ViewMsg_Navigate_Params* params) { | 212 ViewMsg_Navigate_Params* params) { |
213 params->page_id = entry.GetPageID(); | 213 params->page_id = entry.GetPageID(); |
214 params->pending_history_list_offset = controller.GetIndexOfEntry(&entry); | 214 params->pending_history_list_offset = controller.GetIndexOfEntry(&entry); |
215 params->current_history_list_offset = controller.GetLastCommittedEntryIndex(); | 215 params->current_history_list_offset = controller.GetLastCommittedEntryIndex(); |
216 params->current_history_list_length = controller.GetEntryCount(); | 216 params->current_history_list_length = controller.GetEntryCount(); |
217 params->url = entry.GetURL(); | 217 params->url = entry.GetURL(); |
| 218 if (!entry.GetBaseURL().is_empty()) { |
| 219 params->base_url = entry.GetBaseURL(); |
| 220 params->history_url = entry.GetVirtualURL(); |
| 221 } |
218 params->referrer = entry.GetReferrer(); | 222 params->referrer = entry.GetReferrer(); |
219 params->transition = entry.GetTransitionType(); | 223 params->transition = entry.GetTransitionType(); |
220 params->state = entry.GetContentState(); | 224 params->state = entry.GetContentState(); |
221 params->navigation_type = | 225 params->navigation_type = |
222 GetNavigationType(controller.GetBrowserContext(), entry, reload_type); | 226 GetNavigationType(controller.GetBrowserContext(), entry, reload_type); |
223 params->request_time = base::Time::Now(); | 227 params->request_time = base::Time::Now(); |
224 params->extra_headers = entry.extra_headers(); | 228 params->extra_headers = entry.extra_headers(); |
225 params->transferred_request_child_id = | 229 params->transferred_request_child_id = |
226 entry.transferred_global_request_id().child_id; | 230 entry.transferred_global_request_id().child_id; |
227 params->transferred_request_request_id = | 231 params->transferred_request_request_id = |
(...skipping 2860 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3088 browser_plugin_host()->embedder_render_process_host(); | 3092 browser_plugin_host()->embedder_render_process_host(); |
3089 *embedder_container_id = browser_plugin_host()->instance_id(); | 3093 *embedder_container_id = browser_plugin_host()->instance_id(); |
3090 int embedder_process_id = | 3094 int embedder_process_id = |
3091 embedder_render_process_host ? embedder_render_process_host->GetID() : -1; | 3095 embedder_render_process_host ? embedder_render_process_host->GetID() : -1; |
3092 if (embedder_process_id != -1) { | 3096 if (embedder_process_id != -1) { |
3093 *embedder_channel_name = | 3097 *embedder_channel_name = |
3094 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(), | 3098 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(), |
3095 embedder_process_id); | 3099 embedder_process_id); |
3096 } | 3100 } |
3097 } | 3101 } |
OLD | NEW |