content/browser/web_contents/web_contents_impl.h - Issue 23618036: Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED.

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/web_contents/web_contents_impl.h

Issue 23618036: Merge NOTIFICATION_RENDER_VIEW_HOST_CHANGED into NOTIFICATION_WEB_CONTENTS_SWAPPED. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 7 years, 2 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/web_contents/render_view_host_manager_unittest.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 c60aebacb3086904a552ace2f33a7b469e6a9634..0a44a317c73658166906c432d3009a44a37c2206 100644

--- a/content/browser/web_contents/web_contents_impl.h

+++ b/content/browser/web_contents/web_contents_impl.h

@@ -495,7 +495,7 @@ class CONTENT_EXPORT WebContentsImpl

virtual void UpdateRenderViewSizeForRenderManager() OVERRIDE;

virtual void CancelModalDialogsForRenderManager() OVERRIDE;

virtual void NotifySwappedFromRenderManager(

- RenderViewHost* old_render_view_host) OVERRIDE;

+ RenderViewHost* old_host, RenderViewHost* new_host) OVERRIDE;

virtual int CreateOpenerRenderViewsForRenderManager(

SiteInstance* instance) OVERRIDE;

virtual NavigationControllerImpl&

@@ -745,7 +745,7 @@ class CONTENT_EXPORT WebContentsImpl

// Misc non-view stuff -------------------------------------------------------

// Helper functions for sending notifications.

- void NotifySwapped(RenderViewHost* old_render_view_host);

+ void NotifySwapped(RenderViewHost* old_host, RenderViewHost* new_host);

void NotifyDisconnected();

void NotifyNavigationEntryCommitted(const LoadCommittedDetails& load_details);