chrome/browser/chrome_content_browser_client.h - Issue 10690048: Clean up RenderViewHostManager swapping logic.

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: chrome/browser/chrome_content_browser_client.h

Issue 10690048: Clean up RenderViewHostManager swapping logic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix merge conflict Created 8 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:

Index: chrome/browser/chrome_content_browser_client.h

diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h

index 78b741c5ac7c1abc0fc2406927637c98aedf5950..24083e3ebe4aad3653dd9f94bc7cc11c9c452766 100644

--- a/chrome/browser/chrome_content_browser_client.h

+++ b/chrome/browser/chrome_content_browser_client.h

@@ -77,8 +77,10 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {

content::SiteInstance* site_instance) OVERRIDE;

virtual void SiteInstanceDeleting(content::SiteInstance* site_instance)

OVERRIDE;

- virtual bool ShouldSwapProcessesForNavigation(const GURL& current_url,

- const GURL& new_url) OVERRIDE;

+ virtual bool ShouldSwapBrowsingInstanceForNavigation(

+ content::BrowserContext* browser_context,

+ const GURL& current_url,

+ const GURL& new_url) OVERRIDE;

virtual bool ShouldSwapProcessesForRedirect(

content::ResourceContext* resource_context,

const GURL& current_url,

« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »