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

chrome/browser/ui/webui/active_downloads_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/active_downloads_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 26 matching lines @@
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/browser/ui/webui/fileicon_source_chromeos.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
+#include "content/browser/webui/web_ui.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/escape.h"
@@ skipping 257 matching lines @@
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // ActiveDownloadsUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 
 
-ActiveDownloadsUI::ActiveDownloadsUI(WebContents* contents)
-    : HtmlDialogUI(contents),
+ActiveDownloadsUI::ActiveDownloadsUI(WebUI* web_ui)
+    : HtmlDialogUI(web_ui),
       handler_(new ActiveDownloadsHandler()) {
-  AddMessageHandler(handler_);
+  web_ui->AddMessageHandler(handler_);
 
   // Set up the chrome://active-downloads/ source.
-  Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
+  Profile* profile = Profile::FromBrowserContext(
+      web_ui->web_contents()->GetBrowserContext());
   profile->GetChromeURLDataManager()->AddDataSource(
       CreateActiveDownloadsUIHTMLSource());
 }
 
 // static
 bool ActiveDownloadsUI::ShouldShowPopup(Profile* profile,
                                         DownloadItem* download) {
   // Don't show downloads panel for extension/theme downloads from gallery,
   // or temporary downloads.
   ExtensionService* service = profile->GetExtensionService();
@@ skipping 49 matching lines @@
         return (*it);
       }
     }
   }
   return NULL;
 }
 
 const ActiveDownloadsUI::DownloadList& ActiveDownloadsUI::GetDownloads() const {
   return handler_->downloads();
 }