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

Unified Diff: content/browser/web_contents/web_contents_impl.h

Issue 606113005: Move RenderViewHost swap out state to RenderFrameHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix review suggestions Created 6 years, 3 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
« no previous file with comments | « content/browser/site_instance_impl.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index c7c7809edca06d35bb3a1bf9295d65fdaca67377..97146b389edd42ca1440fe08ab1ed8cf26db5a81 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -232,8 +232,8 @@ class CONTENT_EXPORT WebContentsImpl
virtual int32 GetMaxPageID() OVERRIDE;
virtual int32 GetMaxPageIDForSiteInstance(
SiteInstance* site_instance) OVERRIDE;
- virtual SiteInstance* GetSiteInstance() const OVERRIDE;
- virtual SiteInstance* GetPendingSiteInstance() const OVERRIDE;
+ virtual SiteInstanceImpl* GetSiteInstance() const OVERRIDE;
+ virtual SiteInstanceImpl* GetPendingSiteInstance() const OVERRIDE;
virtual bool IsLoading() const OVERRIDE;
virtual bool IsLoadingToDifferentDocument() const OVERRIDE;
virtual bool IsWaitingForResponse() const OVERRIDE;
@@ -433,9 +433,7 @@ class CONTENT_EXPORT WebContentsImpl
virtual WebPreferences ComputeWebkitPrefs() OVERRIDE;
virtual void OnUserGesture() OVERRIDE;
virtual void OnIgnoredUIEvent() OVERRIDE;
- virtual void RendererUnresponsive(RenderViewHost* render_view_host,
- bool is_during_beforeunload,
- bool is_during_unload) OVERRIDE;
+ virtual void RendererUnresponsive(RenderViewHost* render_view_host) OVERRIDE;
virtual void RendererResponsive(RenderViewHost* render_view_host) OVERRIDE;
virtual void LoadStateChanged(const GURL& url,
const net::LoadStateWithParam& load_state,
« no previous file with comments | « content/browser/site_instance_impl.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698