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

chrome/browser/ui/webui/chromeos/login/oobe_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/chromeos/login/oobe_ui.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/update_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.h"
 #include "chrome/browser/ui/webui/options/chromeos/user_image_source.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
+#include "content/browser/webui/web_ui.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/browser_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
 using content::WebContents;
 
 namespace {
 
 // Path for a stripped down login page that does not have OOBE elements.
 const char kLoginPath[] = "login";
@@ skipping 57 matching lines @@
 
 std::string OobeUIHTMLSource::GetDataResource(int resource_id) const {
   const base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id));
   return jstemplate_builder::GetI18nTemplateHtml(html,
                                                  localized_strings_.get());
 }
 
 // OobeUI ----------------------------------------------------------------------
 
-OobeUI::OobeUI(WebContents* contents)
-    : WebUI(contents, this),
+OobeUI::OobeUI(WebUI* web_ui)
+    : WebUIController(web_ui),
       update_screen_actor_(NULL),
       network_screen_actor_(NULL),
       eula_screen_actor_(NULL),
       signin_screen_handler_(NULL),
       user_image_screen_actor_(NULL) {
   core_handler_ = new CoreOobeHandler(this);
   AddScreenHandler(core_handler_);
 
   AddScreenHandler(new NetworkDropdownHandler);
 
@@ skipping 20 matching lines @@
       new UserImageScreenHandler();
   user_image_screen_actor_ = user_image_screen_handler;
   AddScreenHandler(user_image_screen_handler);
 
   signin_screen_handler_ = new SigninScreenHandler;
   AddScreenHandler(signin_screen_handler_);
 
   DictionaryValue* localized_strings = new DictionaryValue();
   GetLocalizedStrings(localized_strings);
 
-  Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
+  Profile* profile = Profile::FromBrowserContext(
+      web_ui->web_contents()->GetBrowserContext());
   // Set up the chrome://theme/ source, for Chrome logo.
   ThemeSource* theme = new ThemeSource(profile);
   profile->GetChromeURLDataManager()->AddDataSource(theme);
 
   // Set up the chrome://terms/ data source, for EULA content.
   AboutUIHTMLSource* about_source =
       new AboutUIHTMLSource(chrome::kChromeUITermsHost, profile);
   profile->GetChromeURLDataManager()->AddDataSource(about_source);
 
   // Set up the chrome://oobe/ source.
@@ skipping 41 matching lines @@
 
 ViewScreenDelegate* OobeUI::GetHTMLPageScreenActor() {
   // WebUI implementation of the LoginDisplayHost opens HTML page directly,
   // without opening OOBE page.
   NOTREACHED();
   return NULL;
 }
 
 void OobeUI::GetLocalizedStrings(base::DictionaryValue* localized_strings) {
   // Note, handlers_[0] is a GenericHandler used by the WebUI.
-  for (size_t i = 1; i < handlers_.size(); ++i) {
-    static_cast<BaseScreenHandler*>(handlers_[i])->
-        GetLocalizedStrings(localized_strings);
-  }
+  for (size_t i = 0; i < handlers_.size(); ++i)
+    handlers_[i]->GetLocalizedStrings(localized_strings);
   ChromeURLDataManager::DataSource::SetFontAndTextDirection(localized_strings);
 }
 
 void OobeUI::AddScreenHandler(BaseScreenHandler* handler) {
-  AddMessageHandler(handler);
+  web_ui()->AddMessageHandler(handler);
+  handlers_.push_back(handler);
 }
 
 void OobeUI::InitializeHandlers() {
-  // Note, handlers_[0] is a GenericHandler used by the WebUI.
-  for (size_t i = 1; i < handlers_.size(); ++i) {
-    static_cast<BaseScreenHandler*>(handlers_[i])->InitializeBase();
-  }
+  for (size_t i = 0; i < handlers_.size(); ++i)
+    handlers_[i]->InitializeBase();
 }
 
 void OobeUI::ShowOobeUI(bool show) {
   core_handler_->ShowOobeUI(show);
 }
 
 void OobeUI::ShowSigninScreen(SigninScreenHandlerDelegate* delegate) {
   signin_screen_handler_->SetDelegate(delegate);
   signin_screen_handler_->Show(core_handler_->show_oobe_ui());
 }
 
 void OobeUI::ResetSigninScreenHandlerDelegate() {
   signin_screen_handler_->SetDelegate(NULL);
 }
 
 void OobeUI::OnLoginPromptVisible() {
   user_image_screen_actor_->CheckCameraPresence();
 }
 
 }  // namespace chromeos