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

chrome/browser/ui/webui/options/chromeos/proxy_handler.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/options/chromeos/proxy_handler.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/stl_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "content/browser/webui/web_ui.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace chromeos {
 
 ProxyHandler::ProxyHandler() {
@@ skipping 54 matching lines @@
           l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES)));
 }
 
 void ProxyHandler::SetNetworkName(const std::string& name) {
   StringValue network(name);
   web_ui()->CallJavascriptFunction("options.ProxyOptions.setNetworkName",
                                    network);
 }
 
 }  // namespace chromeos