content/browser/tab_contents/render_view_host_manager_unittest.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_unittest.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 | « content/browser/tab_contents/render_view_host_manager.cc ('k') | content/browser/tab_contents/tab_contents.h » ('j') | content/browser/webui/web_ui.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/tab_contents/render_view_host_manager_unittest.cc

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

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

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

@@ -32,6 +32,7 @@

using content::NavigationEntry;

using content::NavigationEntryImpl;

using content::WebContents;

+using content::WebUIController;

namespace {

@@ -50,12 +51,11 @@

}

// WebUIFactory implementation.

- virtual WebUI* CreateWebUIForURL(WebContents* source,

- const GURL& url) const OVERRIDE {

+ virtual WebUIController* CreateWebUIForURL(WebUI* web_ui,

Evan Stade 2012/01/17 19:14:56 ditto

+ const GURL& url) const OVERRIDE {

if (!(should_create_webui_ && HasWebUIScheme(url)))

return NULL;

- static content::WebUIController temp_controller;

- return new WebUI(source, &temp_controller);

+ return new WebUIController(web_ui);

}

virtual bool UseWebUIForURL(content::BrowserContext* browser_context,

« no previous file with comments | « content/browser/tab_contents/render_view_host_manager.cc ('k') | content/browser/tab_contents/tab_contents.h » ('j') | content/browser/webui/web_ui.h » ('J')