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

chrome/browser/ui/webui/sync_internals_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/sync_internals_ui.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/tracked_objects.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/js/js_arg_list.h"
 #include "chrome/browser/sync/js/js_controller.h"
 #include "chrome/browser/sync/js/js_event_details.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/sync/util/weak_handle.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/webui/web_ui.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/sync_internals_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using browser_sync::JsArgList;
 using browser_sync::JsEventDetails;
 using browser_sync::JsReplyHandler;
 using browser_sync::WeakHandle;
 using content::WebContents;
 
@@ skipping 29 matching lines @@
 namespace {
 
 // Gets the ProfileSyncService of the underlying original profile.
 // May return NULL (e.g., if sync is disabled on the command line).
 ProfileSyncService* GetProfileSyncService(Profile* profile) {
   return profile->GetOriginalProfile()->GetProfileSyncService();
 }
 
 }  // namespace
 
-SyncInternalsUI::SyncInternalsUI(WebContents* contents)
-    : WebUI(contents, this),
+SyncInternalsUI::SyncInternalsUI(WebUI* web_ui)
+    : WebUIController(web_ui),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   // TODO(akalin): Fix.
-  Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
+  Profile* profile = Profile::FromBrowserContext(
+      web_ui->web_contents()->GetBrowserContext());
   profile->GetChromeURLDataManager()->AddDataSource(
       CreateSyncInternalsHTMLSource());
   ProfileSyncService* sync_service = GetProfileSyncService(profile);
   if (sync_service) {
     js_controller_ = sync_service->GetJsController();
   }
   if (js_controller_.get()) {
     js_controller_->AddJsEventHandler(this);
   }
 }
@@ skipping 10 matching lines @@
   scoped_ptr<ListValue> content_copy(content.DeepCopy());
   JsArgList args(content_copy.get());
   VLOG(1) << "Received message: " << name << " with args "
           << args.ToString();
   // We handle this case directly because it needs to work even if
   // the sync service doesn't exist.
   if (name == "getAboutInfo") {
     ListValue return_args;
     DictionaryValue* about_info = new DictionaryValue();
     return_args.Append(about_info);
-    Profile* profile =
-      Profile::FromBrowserContext(web_contents()->GetBrowserContext());
+    Profile* profile = Profile::FromBrowserContext(
+        web_ui()->web_contents()->GetBrowserContext());
     ProfileSyncService* service = GetProfileSyncService(profile);
     sync_ui_util::ConstructAboutInformation(service, about_info);
     HandleJsReply(name, JsArgList(&return_args));
   } else {
     if (js_controller_.get()) {
       js_controller_->ProcessJsMessage(
           name, args,
           MakeWeakHandle(weak_ptr_factory_.GetWeakPtr()));
     } else {
       LOG(WARNING) << "No sync service; dropping message " << name
                    << " with args " << args.ToString();
     }
   }
   return true;
 }
 
 void SyncInternalsUI::HandleJsEvent(
     const std::string& name, const JsEventDetails& details) {
   VLOG(1) << "Handling event: " << name << " with details "
           << details.ToString();
   const std::string& event_handler = "chrome.sync." + name + ".fire";
   std::vector<const Value*> arg_list(1, &details.Get());
-  CallJavascriptFunction(event_handler, arg_list);
+  web_ui()->CallJavascriptFunction(event_handler, arg_list);
 }
 
 void SyncInternalsUI::HandleJsReply(
     const std::string& name, const JsArgList& args) {
   VLOG(1) << "Handling reply for " << name << " message with args "
           << args.ToString();
   const std::string& reply_handler = "chrome.sync." + name + ".handleReply";
   std::vector<const Value*> arg_list(args.Get().begin(), args.Get().end());
-  CallJavascriptFunction(reply_handler, arg_list);
+  web_ui()->CallJavascriptFunction(reply_handler, arg_list);
 }