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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 10544175: Add an ability to call WebKit's WebFrame::loadData via NavigationController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More comments addressed Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/web_contents/navigation_entry_impl.cc ('k') | content/common/view_messages.h » ('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 (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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 content::WebContentsDelegate* delegate, 209 content::WebContentsDelegate* delegate,
210 NavigationController::ReloadType reload_type, 210 NavigationController::ReloadType reload_type,
211 const std::string& embedder_channel_name, 211 const std::string& embedder_channel_name,
212 int embedder_container_id, 212 int embedder_container_id,
213 ViewMsg_Navigate_Params* params) { 213 ViewMsg_Navigate_Params* params) {
214 params->page_id = entry.GetPageID(); 214 params->page_id = entry.GetPageID();
215 params->pending_history_list_offset = controller.GetIndexOfEntry(&entry); 215 params->pending_history_list_offset = controller.GetIndexOfEntry(&entry);
216 params->current_history_list_offset = controller.GetLastCommittedEntryIndex(); 216 params->current_history_list_offset = controller.GetLastCommittedEntryIndex();
217 params->current_history_list_length = controller.GetEntryCount(); 217 params->current_history_list_length = controller.GetEntryCount();
218 params->url = entry.GetURL(); 218 params->url = entry.GetURL();
219 if (!entry.GetBaseURLForDataURL().is_empty()) {
220 params->base_url_for_data_url = entry.GetBaseURLForDataURL();
221 params->history_url_for_data_url = entry.GetVirtualURL();
222 }
219 params->referrer = entry.GetReferrer(); 223 params->referrer = entry.GetReferrer();
220 params->transition = entry.GetTransitionType(); 224 params->transition = entry.GetTransitionType();
221 params->state = entry.GetContentState(); 225 params->state = entry.GetContentState();
222 params->navigation_type = 226 params->navigation_type =
223 GetNavigationType(controller.GetBrowserContext(), entry, reload_type); 227 GetNavigationType(controller.GetBrowserContext(), entry, reload_type);
224 params->request_time = base::Time::Now(); 228 params->request_time = base::Time::Now();
225 params->extra_headers = entry.extra_headers(); 229 params->extra_headers = entry.extra_headers();
226 params->transferred_request_child_id = 230 params->transferred_request_child_id =
227 entry.transferred_global_request_id().child_id; 231 entry.transferred_global_request_id().child_id;
228 params->transferred_request_request_id = 232 params->transferred_request_request_id =
(...skipping 2887 matching lines...) Expand 10 before | Expand all | Expand 10 after
3116 browser_plugin_host()->embedder_render_process_host(); 3120 browser_plugin_host()->embedder_render_process_host();
3117 *embedder_container_id = browser_plugin_host()->instance_id(); 3121 *embedder_container_id = browser_plugin_host()->instance_id();
3118 int embedder_process_id = 3122 int embedder_process_id =
3119 embedder_render_process_host ? embedder_render_process_host->GetID() : -1; 3123 embedder_render_process_host ? embedder_render_process_host->GetID() : -1;
3120 if (embedder_process_id != -1) { 3124 if (embedder_process_id != -1) {
3121 *embedder_channel_name = 3125 *embedder_channel_name =
3122 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(), 3126 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(),
3123 embedder_process_id); 3127 embedder_process_id);
3124 } 3128 }
3125 } 3129 }
OLDNEW
« no previous file with comments | « content/browser/web_contents/navigation_entry_impl.cc ('k') | content/common/view_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698