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

chrome/browser/ui/webui/uber/uber_ui.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/ui/webui/uber/uber_ui.h"
 
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_factory.h"
 #include "chrome/browser/ui/webui/extensions/extensions_ui.h"
 #include "chrome/browser/ui/webui/options2/options_ui2.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/webui/web_ui.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 using content::WebContents;
 
 namespace {
 
 ChromeWebUIDataSource* CreateUberHTMLSource() {
@@ skipping 17 matching lines @@
 #if defined(OS_CHROMEOS)
   source->AddString("aboutPageHost",
                     ASCIIToUTF16(chrome::kAboutOptionsSubPage));
   source->AddLocalizedString("aboutPageDisplayName", IDS_ABOUT_TAB_TITLE);
 #endif
   return source;
 }
 
 }  // namespace
 
-UberUI::UberUI(WebContents* contents) : WebUI(contents, this) {
-  Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
+UberUI::UberUI(WebUI* web_ui) : WebUIController(web_ui) {
+  Profile* profile = Profile::FromBrowserContext(
+      web_ui->web_contents()->GetBrowserContext());
   profile->GetChromeURLDataManager()->AddDataSource(CreateUberHTMLSource());
 
   RegisterSubpage(chrome::kChromeUISettingsFrameURL);
   RegisterSubpage(chrome::kChromeUIExtensionsFrameURL);
 #if defined(OS_CHROMEOS)
   RegisterSubpage(chrome::kChromeUIAboutPageFrameURL);
 #endif
 }
 
 UberUI::~UberUI() {
   STLDeleteValues(&sub_uis_);
 }
 
 void UberUI::RegisterSubpage(const std::string& page_url) {
-  WebUI* web_ui = ChromeWebUIFactory::GetInstance()->CreateWebUIForURL(
-      web_contents_, GURL(page_url));
+  WebUI* webui = web_ui()->web_contents()->CreateWebUI(GURL(page_url));
 
-  web_ui->set_frame_xpath("//iframe[@src='" + page_url + "']");
-  sub_uis_[page_url] = web_ui;
+  webui->SetFrameXPath("//iframe[@src='" + page_url + "']");
+  sub_uis_[page_url] = webui;
 }
 
 void UberUI::RenderViewCreated(RenderViewHost* render_view_host) {
   for (SubpageMap::iterator iter = sub_uis_.begin(); iter != sub_uis_.end();
        ++iter) {
-    iter->second->controller()->RenderViewCreated(render_view_host);
+    iter->second->GetController()->RenderViewCreated(render_view_host);
   }
 }
 
 void UberUI::RenderViewReused(RenderViewHost* render_view_host) {
   for (SubpageMap::iterator iter = sub_uis_.begin(); iter != sub_uis_.end();
        ++iter) {
-    iter->second->controller()->RenderViewReused(render_view_host);
+    iter->second->GetController()->RenderViewReused(render_view_host);
   }
 }
 
 void UberUI::DidBecomeActiveForReusedRenderView() {
   for (SubpageMap::iterator iter = sub_uis_.begin(); iter != sub_uis_.end();
        ++iter) {
-    iter->second->controller()->DidBecomeActiveForReusedRenderView();
+    iter->second->GetController()->DidBecomeActiveForReusedRenderView();
   }
 }
 
 bool UberUI::OverrideHandleWebUIMessage(const GURL& source_url,
                                         const std::string& message,
                                         const ListValue& args) {
   // Find the appropriate subpage and forward the message.
   SubpageMap::iterator subpage = sub_uis_.find(source_url.GetOrigin().spec());
   if (subpage == sub_uis_.end()) {
     // The message was sent from the uber page itself.
     DCHECK_EQ(std::string(chrome::kChromeUIUberHost), source_url.host());
     return false;
   }
 
   // The message was sent from a subpage.
   // TODO(jam) fix this to use interface
-  //return subpage->second->controller()->OverrideHandleWebUIMessage(
+  //return subpage->second->GetController()->OverrideHandleWebUIMessage(
     //  source_url, message, args);
   subpage->second->OnWebUISend(source_url, message, args);
   return true;
 }