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

chrome/browser/ui/webui/chromeos/login/oobe_ui.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_CHROMEOS_LOGIN_OOBE_UI_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_
 #pragma once
 
+#include <vector>
+
+#include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/login/oobe_display.h"
-#include "content/browser/webui/web_ui.h"
 #include "content/public/browser/web_ui_controller.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace chromeos {
 class BaseScreenHandler;
 class CoreOobeHandler;
 class SigninScreenHandler;
 class SigninScreenHandlerDelegate;
 }
 
 namespace chromeos {
 
 // A custom WebUI that defines datasource for out-of-box-experience (OOBE) UI:
 // - welcome screen (setup language/keyboard/network).
 // - eula screen (CrOS (+ OEM) EULA content/TPM password/crash reporting).
 // - update screen.
 class OobeUI : public OobeDisplay,
-               public WebUI, public content::WebUIController {
+               public content::WebUIController {
  public:
-  explicit OobeUI(content::WebContents* contents);
+  explicit OobeUI(WebUI* web_ui);
 
   // OobeDisplay implementation:
   virtual void ShowScreen(WizardScreen* screen) OVERRIDE;
   virtual void HideScreen(WizardScreen* screen) OVERRIDE;
   virtual UpdateScreenActor* GetUpdateScreenActor() OVERRIDE;
   virtual NetworkScreenActor* GetNetworkScreenActor() OVERRIDE;
   virtual EulaScreenActor* GetEulaScreenActor() OVERRIDE;
   virtual EnterpriseEnrollmentScreenActor* GetEnterpriseEnrollmentScreenActor()
       OVERRIDE;
   virtual UserImageScreenActor* GetUserImageScreenActor() OVERRIDE;
@@ skipping 28 matching lines @@
   UpdateScreenActor* update_screen_actor_;
   NetworkScreenActor* network_screen_actor_;
   EulaScreenActor* eula_screen_actor_;
   EnterpriseEnrollmentScreenActor* enterprise_enrollment_screen_actor_;
 
   // Reference to SigninScreenHandler that handles sign-in screen requrests and
   // forward calls from native code to JS side.
   SigninScreenHandler* signin_screen_handler_;
   UserImageScreenActor* user_image_screen_actor_;
 
+  std::vector<BaseScreenHandler*> handlers_;  // Non-owning pointers.
+
   DISALLOW_COPY_AND_ASSIGN(OobeUI);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_