Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership...

content/public/browser/web_ui_factory.h

Index: content/public/browser/web_ui_factory.h
===================================================================
--- content/public/browser/web_ui_factory.h	(revision 117871)
+++ content/public/browser/web_ui_factory.h	(working copy)
@@ -15,6 +15,7 @@
 
 class BrowserContext;
 class WebContents;
+class WebUIController;
 
 // Interface for an object which controls which URLs are considered WebUI URLs
 // and creates WebUI instances for given URLs.
@@ -22,8 +23,8 @@
  public:
   // Returns a WebUI instance for the given URL, or NULL if the URL doesn't

[Evan Stade, 2012/01/17 19:14:56]

this comment is out of date (WebUIController instead of WebUI) and perhaps the
function name should be updated as well

[jam, 2012/01/17 19:20:45]

yep I'm planning on updating the interface and method names. i didn't do this in
this change because it was already touching a large number of files and i wanted
it to be mostly trivial so that the files are easy to scan through. i have this
on my task list to update though

   // correspond to a WebUI.
-  virtual WebUI* CreateWebUIForURL(WebContents* source,
-                                   const GURL& url) const = 0;
+  virtual WebUIController* CreateWebUIForURL(WebUI* web_ui,
+                                             const GURL& url) const = 0;
 
   // Gets the WebUI type for the given URL. This will return kNoWebUI if the
   // corresponding call to CreateWebUIForURL would fail, or something non-NULL