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

chrome/browser/ui/webui/chromeos/keyboard_overlay_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/chromeos/keyboard_overlay_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/weak_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.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/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/webui/web_ui.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using chromeos::input_method::ModifierKey;
-using content::WebContents;
 using content::WebUIMessageHandler;
 
 namespace {
 
 const char kLearnMoreURL[] =
 #if defined(OFFICIAL_BUILD)
     "chrome-extension://honijodknafkokifofgiaalefdiedpko/"
     "main.html?answer=188743";
 #else
     "http://support.google.com/chromeos/bin/answer.py?answer=183101";
@@ skipping 259 matching lines @@
   browser->AddSelectedTabWithURL(GURL(kLearnMoreURL),
                                  content::PAGE_TRANSITION_LINK);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // KeyboardOverlayUI
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-KeyboardOverlayUI::KeyboardOverlayUI(WebContents* contents)
-    : HtmlDialogUI(contents) {
-  Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
+KeyboardOverlayUI::KeyboardOverlayUI(WebUI* web_ui)
+    : HtmlDialogUI(web_ui) {
+  Profile* profile = Profile::FromBrowserContext(
+      web_ui->web_contents()->GetBrowserContext());
   KeyboardOverlayHandler* handler = new KeyboardOverlayHandler(profile);
-  AddMessageHandler(handler);
+  web_ui->AddMessageHandler(handler);
 
   // Set up the chrome://keyboardoverlay/ source.
   profile->GetChromeURLDataManager()->AddDataSource(
       CreateKeyboardOverlayUIHTMLSource());
 }