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

content/public/browser/web_ui_factory.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_PUBLIC_BROWSER_WEB_UI_FACTORY_H_
 #define CONTENT_PUBLIC_BROWSER_WEB_UI_FACTORY_H_
 #pragma once
 
 #include "content/browser/webui/web_ui.h"
 #include "content/common/content_export.h"
 
 class GURL;
 
 namespace content {
 
 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.
 class CONTENT_EXPORT WebUIFactory {
  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
   // if CreateWebUIForURL would succeed.
   virtual WebUI::TypeID GetWebUIType(BrowserContext* browser_context,
                                      const GURL& url) const = 0;
 
   // Shorthand for the above, but returns a simple yes/no.
   virtual bool UseWebUIForURL(BrowserContext* browser_context,
                               const GURL& url) const = 0;
@@ skipping 12 matching lines @@
   // normal tabs such as javascript: URLs or about:hang.
   virtual bool IsURLAcceptableForWebUI(BrowserContext* browser_context,
                                        const GURL& url) const = 0;
 
   virtual ~WebUIFactory() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_WEB_UI_FACTORY_H_