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

chrome/browser/ui/webui/options2/options_ui2.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI2_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI2_H_
 #pragma once
 
 #include <string>
+#include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
-#include "content/browser/webui/web_ui.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_ui_controller.h"
 #include "content/public/browser/web_ui_message_handler.h"
 
 namespace options2 {
 
 // The base class handler of Javascript messages of options pages.
 class OptionsPageUIHandler : public content::WebUIMessageHandler,
@@ skipping 50 matching lines @@
 // should provide.
 class OptionsPageUIHandlerHost {
  public:
   virtual void InitializeHandlers() = 0;
 
  protected:
   virtual ~OptionsPageUIHandlerHost() {}
 };
 
 // The WebUI for chrome:settings-frame.
-class OptionsUI : public WebUI, public content::WebUIController,
+class OptionsUI : public content::WebUIController,
                   public OptionsPageUIHandlerHost {
  public:
-  explicit OptionsUI(content::WebContents* contents);
+  explicit OptionsUI(WebUI* web_ui);
   virtual ~OptionsUI();
 
   static RefCountedMemory* GetFaviconResourceBytes();
 
   // WebUIController implementation.
   virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
   virtual void RenderViewReused(RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidBecomeActiveForReusedRenderView() OVERRIDE;
 
   // Overridden from OptionsPageUIHandlerHost:
   virtual void InitializeHandlers() OVERRIDE;
 
  private:
   // Adds OptionsPageUiHandler to the handlers list if handler is enabled.
   void AddOptionsPageUIHandler(base::DictionaryValue* localized_strings,
                                OptionsPageUIHandler* handler);
 
   // Sets the WebUI CommandLineString property with arguments passed while
   // launching chrome.
   void SetCommandLineString(RenderViewHost* render_view_host);
 
   bool initialized_handlers_;
 
+  std::vector<OptionsPageUIHandler*> handlers_;
+
   DISALLOW_COPY_AND_ASSIGN(OptionsUI);
 };
 
 }  // namespace options2
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_OPTIONS_UI2_H_