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

Unified Diff: chrome/browser/prerender/prerender_manager.cc

Issue 9473001: Extract minimal RenderViewHost interface for embedders, leaving (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to LKGR. Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prerender/prerender_manager.cc
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index 1732a7156331e05501c6892f396a5b510f337332..441c87328ed31675e1016067bbffe3a5d02d0bf3 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -385,8 +385,8 @@ bool PrerenderManager::MaybeUsePrerenderedPage(WebContents* web_contents,
GetRenderViewHost();
DCHECK(old_render_view_host);
DCHECK(new_render_view_host);
- if (old_render_view_host->session_storage_namespace() !=
- new_render_view_host->session_storage_namespace()) {
+ if (old_render_view_host->GetSessionStorageNamespace() !=
+ new_render_view_host->GetSessionStorageNamespace()) {
DestroyAndMarkMatchCompleteAsUsed(
prerender_contents.release(),
FINAL_STATUS_SESSION_STORAGE_NAMESPACE_MISMATCH);
@@ -423,7 +423,7 @@ bool PrerenderManager::MaybeUsePrerenderedPage(WebContents* web_contents,
prerender_contents->set_final_status(FINAL_STATUS_USED);
new_render_view_host->Send(
- new ChromeViewMsg_SetIsPrerendering(new_render_view_host->routing_id(),
+ new ChromeViewMsg_SetIsPrerendering(new_render_view_host->GetRoutingID(),
false));
TabContentsWrapper* new_tab_contents =
@@ -869,7 +869,7 @@ bool PrerenderManager::AddPrerender(
child_route_id_pair.second);
// Don't prerender page if parent RenderViewHost no longer exists, or it has
// no view. The latter should only happen when the RenderView has closed.
- if (!source_render_view_host || !source_render_view_host->view()) {
+ if (!source_render_view_host || !source_render_view_host->GetView()) {
RecordFinalStatus(origin, experiment,
FINAL_STATUS_SOURCE_RENDER_VIEW_CLOSED);
return false;
@@ -878,7 +878,7 @@ bool PrerenderManager::AddPrerender(
if (!session_storage_namespace && source_render_view_host) {
session_storage_namespace =
- source_render_view_host->session_storage_namespace();
+ source_render_view_host->GetSessionStorageNamespace();
}
PrerenderContents* prerender_contents = CreatePrerenderContents(
« no previous file with comments | « chrome/browser/prerender/prerender_contents.cc ('k') | chrome/browser/printing/background_printing_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698