content/browser/site_instance_impl.h - Issue 19021004: Prevent creating a swapped out RVH in the same SiteInstance as the current one.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/site_instance_impl.h

Issue 19021004: 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: Fix decisions for hosted apps Created 7 years, 5 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/devtools/devtools_manager_unittest.cc ('k') | content/browser/web_contents/render_view_host_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 b195d09fa05c23b5a7f4fc4f26eacc21420dd38b..57291ea9d0d1530c9ad797d41998c62b2f141600 100644

--- a/content/browser/site_instance_impl.h

+++ b/content/browser/site_instance_impl.h

@@ -51,6 +51,10 @@ 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.

+ static GURL GetEffectiveURL(BrowserContext* browser_context,

+ const GURL& url);

protected:

friend class BrowsingInstance;

friend class SiteInstance;

@@ -64,10 +68,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);

// NotificationObserver implementation.

virtual void Observe(int type,

const NotificationSource& source,

« no previous file with comments | « content/browser/devtools/devtools_manager_unittest.cc ('k') | content/browser/web_contents/render_view_host_manager.cc » ('j') | no next file with comments »