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

Unified Diff: content/browser/site_instance_impl.h

Issue 57433010: Prevent creating a swapped out RVH in the same SiteInstance as the current one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase again Created 7 years, 1 month 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/frame_host/render_view_host_manager_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/site_instance_impl.h
diff --git a/content/browser/site_instance_impl.h b/content/browser/site_instance_impl.h
index 09249ee0d2a2316a3fbed2ae90251e1514780eec..649ee4bb1e2dc279fd84adb20ae59b3ec97f8c41 100644
--- a/content/browser/site_instance_impl.h
+++ b/content/browser/site_instance_impl.h
@@ -66,6 +66,15 @@ class CONTENT_EXPORT SiteInstanceImpl : public SiteInstance,
static void set_render_process_host_factory(
const RenderProcessHostFactory* rph_factory);
+ // Get the effective URL for the given actual URL. This allows the
+ // ContentBrowserClient to override the SiteInstance's site for certain URLs.
+ // For example, Chrome uses this to replace hosted app URLs with extension
+ // hosts.
+ // Only public so that we can make a consistent process swap decision in
+ // RenderViewHostManager.
+ static GURL GetEffectiveURL(BrowserContext* browser_context,
+ const GURL& url);
+
protected:
friend class BrowsingInstance;
friend class SiteInstance;
@@ -79,10 +88,6 @@ class CONTENT_EXPORT SiteInstanceImpl : public SiteInstance,
explicit SiteInstanceImpl(BrowsingInstance* browsing_instance);
private:
- // Get the effective URL for the given actual URL.
- static GURL GetEffectiveURL(BrowserContext* browser_context,
- const GURL& url);
-
// RenderProcessHostObserver implementation.
virtual void RenderProcessHostDestroyed(RenderProcessHost* host) OVERRIDE;
« no previous file with comments | « content/browser/frame_host/render_view_host_manager_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698