content/browser/tab_contents/render_view_host_manager.cc - Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership...

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/tab_contents/render_view_host_manager.cc

Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync to head to clear linux_chromeos browsertest failures Created 8 years, 11 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 | « chrome/browser/ui/webui/workers_ui.cc ('k') | content/browser/tab_contents/render_view_host_manager_unittest.cc » ('j') | content/browser/tab_contents/render_view_host_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/tab_contents/render_view_host_manager.cc

===================================================================

--- content/browser/tab_contents/render_view_host_manager.cc (revision 117871)

+++ content/browser/tab_contents/render_view_host_manager.cc (working copy)

@@ -542,7 +542,7 @@

// If the pending navigation is to a WebUI, tell the RenderView about any

// bindings it will need enabled.

if (pending_web_ui_.get())

- render_view_host->AllowBindings(pending_web_ui_->bindings());

+ render_view_host->AllowBindings(pending_web_ui_->GetBindings());

return delegate_->CreateRenderViewForRenderManager(render_view_host);

}

@@ -557,7 +557,7 @@

// Next commit the Web UI, if any.

web_ui_.swap(pending_web_ui_);

if (web_ui_.get() && pending_web_ui_.get() && !pending_render_view_host_)

- web_ui_->controller()->DidBecomeActiveForReusedRenderView();

+ web_ui_->GetController()->DidBecomeActiveForReusedRenderView();

pending_web_ui_.reset();

// It's possible for the pending_render_view_host_ to be NULL when we aren't

@@ -737,7 +737,7 @@

return pending_render_view_host_;

} else {

if (pending_web_ui_.get() && render_view_host_->IsRenderViewLive())

- pending_web_ui_->controller()->RenderViewReused(render_view_host_);

+ pending_web_ui_->GetController()->RenderViewReused(render_view_host_);

// The renderer can exit view source mode when any error or cancellation

// happen. We must overwrite to recover the mode.