content/browser/web_contents/web_contents_impl.h - Issue 1472703004: Reland #2 of: Move WebUI ownership from the RenderFrameHostManager to the RenderFrameHost.

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 1472703004: Reland #2 of: Move WebUI ownership from the RenderFrameHostManager to the RenderFrameHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Tests simulatneous navigation involving WebUIs; minor test improvements. Created 5 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

« content/browser/frame_host/render_frame_host_manager_unittest.cc ('K') | « content/browser/frame_host/render_frame_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 441cedc27c3d583997679adfbf149684f7f6fd72..3a8a888f792b8d3fc023574f12d6c4621282e950 100644

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

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

@@ -440,6 +440,7 @@ class CONTENT_EXPORT WebContentsImpl

RenderFrameHost* target_rfh,

SiteInstance* source_site_instance) const override;

void EnsureOpenerProxiesExist(RenderFrameHost* source_rfh) override;

+ scoped_ptr<WebUIImpl> CreateWebUIForRenderFrameHost(const GURL& url) override;

#if defined(OS_WIN)

gfx::NativeViewAccessible GetParentNativeViewAccessible() override;

#endif

@@ -636,7 +637,6 @@ class CONTENT_EXPORT WebContentsImpl

RenderViewHost* old_host,

RenderViewHost* new_host) override;

NavigationControllerImpl& GetControllerForRenderManager() override;

- scoped_ptr<WebUIImpl> CreateWebUIForRenderManager(const GURL& url) override;

NavigationEntry* GetLastCommittedNavigationEntryForRenderManager() override;

bool FocusLocationBarByDefault() override;

void SetFocusToLocationBar(bool select_all) override;