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

chrome/browser/ui/webui/workers_ui.cc

 // 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.
 
 #include "chrome/browser/ui/webui/workers_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_writer.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/webui/web_ui.h"
+#include "content/browser/worker_host/worker_process_host.h"
 #include "content/public/browser/devtools_agent_host_registry.h"
-#include "content/browser/worker_host/worker_process_host.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/worker_service.h"
 #include "content/public/browser/worker_service_observer.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "content/public/common/process_type.h"
 #include "grit/generated_resources.h"
 #include "grit/workers_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
@@ skipping 195 matching lines @@
     worker_data->SetInteger(kWorkerRouteIdField, worker_route_id);
 
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&WorkerCreationDestructionListener::NotifyWorkerDestroyed,
                    this, base::Owned(worker_data)));
   }
   virtual void WorkerContextStarted(WorkerProcessHost*, int) OVERRIDE {}
 
   void NotifyWorkerCreated(DictionaryValue* worker_data) {
-    if (workers_ui_)
-      workers_ui_->CallJavascriptFunction("workerCreated", *worker_data);
+    if (!workers_ui_) {
+      workers_ui_->web_ui()->CallJavascriptFunction(
+          "workerCreated", *worker_data);
+    }
   }
 
   void NotifyWorkerDestroyed(DictionaryValue* worker_data) {
-    if (workers_ui_)
-      workers_ui_->CallJavascriptFunction("workerDestroyed", *worker_data);
+    if (workers_ui_) {
+      workers_ui_->web_ui()->CallJavascriptFunction(
+          "workerDestroyed", *worker_data);
+    }
   }
 
   void RegisterObserver() {
     WorkerService::GetInstance()->AddObserver(this);
   }
   void UnregisterObserver() {
     WorkerService::GetInstance()->RemoveObserver(this);
   }
 
   WorkersUI* workers_ui_;
 };
 
-WorkersUI::WorkersUI(WebContents* contents)
-    : WebUI(contents, this),
+WorkersUI::WorkersUI(WebUI* web_ui)
+    : WebUIController(web_ui),
       observer_(new WorkerCreationDestructionListener(this)){
-  AddMessageHandler(new WorkersDOMHandler());
+  web_ui->AddMessageHandler(new WorkersDOMHandler());
 
   WorkersUIHTMLSource* html_source = new WorkersUIHTMLSource();
 
   // Set up the chrome://workers/ source.
-  Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
+  Profile* profile = Profile::FromBrowserContext(
+      web_ui->web_contents()->GetBrowserContext());
   profile->GetChromeURLDataManager()->AddDataSource(html_source);
 }
 
 WorkersUI::~WorkersUI() {
   observer_->WorkersUIDestroyed();
   observer_ = NULL;
 }