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

chrome/browser/chromeos/login/webui_screen_locker.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/chromeos/login/webui_screen_locker.h"
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/screen_locker.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/ui/views/dom_view.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
+#include "content/browser/webui/web_ui.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/screen.h"
 
 namespace {
 
 // URL which corresponds to the login WebUI.
 const char kLoginURL[] = "chrome://oobe/login";
@@ skipping 23 matching lines @@
   OnWindowCreated();
   LoadURL(GURL(kLoginURL));
   lock_window->Grab(webui_login_);
 
   // User list consisting of a single logged-in user.
   UserList users(1, &chromeos::UserManager::Get()->logged_in_user());
   login_display_.reset(new WebUILoginDisplay(this));
   login_display_->set_background_bounds(bounds);
   login_display_->Init(users, false, true, false);
 
-  static_cast<OobeUI*>(GetWebUI())->ShowSigninScreen(login_display_.get());
+  static_cast<OobeUI*>(GetWebUI()->GetController())->ShowSigninScreen(
+      login_display_.get());
 
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
                  content::NotificationService::AllSources());
   registrar_.Add(this,
                  chrome::NOTIFICATION_LOCK_WEBUI_READY,
                  content::NotificationService::AllSources());
 }
 
 void WebUIScreenLocker::ScreenLockReady() {
@@ skipping 37 matching lines @@
 
 void WebUIScreenLocker::ClearErrors() {
   GetWebUI()->CallJavascriptFunction("cr.ui.Oobe.clearErrors");
 }
 
 WebUIScreenLocker::~WebUIScreenLocker() {
   DCHECK(lock_window_);
   lock_window_->Close();
   // If LockScreen() was called, we need to clear the signin screen handler
   // delegate set in ShowSigninScreen so that it no longer points to us.
-  if (login_display_.get())
-    static_cast<OobeUI*>(GetWebUI())->ResetSigninScreenHandlerDelegate();
+  if (login_display_.get()) {
+    static_cast<OobeUI*>(GetWebUI()->GetController())->
+        ResetSigninScreenHandlerDelegate();
+  }
   SetStatusAreaEnabled(true);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebUIScreenLocker, content::NotificationObserver implementation:
 
 void WebUIScreenLocker::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
@@ skipping 65 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Overridden from WebUILoginView:
 
 views::Widget::InitParams::Type WebUIScreenLocker::GetStatusAreaWidgetType() {
   return views::Widget::InitParams::TYPE_POPUP;
 }
 
 }  // namespace chromeos