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

chrome/browser/ui/webui/ntp/new_tab_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 "build/build_config.h"
 
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 
 #include <set>
 
@@ skipping 26 matching lines @@
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h"
 #include "chrome/browser/ui/webui/ntp/recently_closed_tabs_handler.h"
 #include "chrome/browser/ui/webui/theme_source.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_view_host.h"
+#include "content/browser/webui/web_ui.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 using content::UserMetricsAction;
 using content::WebContents;
+using content::WebUIController;
 
 namespace {
 
 // The amount of time there must be no painting for us to consider painting
 // finished.  Observed times are in the ~1200ms range on Windows.
 const int kTimeoutMs = 2000;
 
 // Strings sent to the page via jstemplates used to set the direction of the
 // HTML document based on locale.
 const char kRTLHtmlTextDirection[] = "rtl";
 const char kLTRHtmlTextDirection[] = "ltr";
 
-static base::LazyInstance<std::set<const WebUI*> > g_live_new_tabs;
+static base::LazyInstance<std::set<const WebUIController*> > g_live_new_tabs;
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // NewTabUI
 
-NewTabUI::NewTabUI(WebContents* contents)
-    : WebUI(contents, this) {
+NewTabUI::NewTabUI(WebUI* web_ui)
+    : WebUIController(web_ui) {
   g_live_new_tabs.Pointer()->insert(this);
   // Override some options on the Web UI.
-  hide_favicon_ = true;
+  web_ui->HideFavicon();
 
-  focus_location_bar_by_default_ = true;
-  should_hide_url_ = true;
-  overridden_title_ = l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE);
+  web_ui->FocusLocationBarByDefault();
+  web_ui->HideURL();
+  web_ui->OverrideTitle(l10n_util::GetStringUTF16(IDS_NEW_TAB_TITLE));
 
   // We count all link clicks as AUTO_BOOKMARK, so that site can be ranked more
   // highly. Note this means we're including clicks on not only most visited
   // thumbnails, but also clicks on recently bookmarked.
-  link_transition_type_ = content::PAGE_TRANSITION_AUTO_BOOKMARK;
+  web_ui->SetLinkTransitionType(content::PAGE_TRANSITION_AUTO_BOOKMARK);
 
   if (!GetProfile()->IsOffTheRecord()) {
-    AddMessageHandler(new browser_sync::ForeignSessionHandler());
-    AddMessageHandler(new MostVisitedHandler());
-    AddMessageHandler(new RecentlyClosedTabsHandler());
-    AddMessageHandler(new MetricsHandler());
+    web_ui->AddMessageHandler(new browser_sync::ForeignSessionHandler());
+    web_ui->AddMessageHandler(new MostVisitedHandler());
+    web_ui->AddMessageHandler(new RecentlyClosedTabsHandler());
+    web_ui->AddMessageHandler(new MetricsHandler());
     if (GetProfile()->IsSyncAccessible())
-      AddMessageHandler(new NewTabPageSyncHandler());
+      web_ui->AddMessageHandler(new NewTabPageSyncHandler());
     ExtensionService* service = GetProfile()->GetExtensionService();
     // We might not have an ExtensionService (on ChromeOS when not logged in
     // for example).
     if (service)
-      AddMessageHandler(new AppLauncherHandler(service));
+      web_ui->AddMessageHandler(new AppLauncherHandler(service));
 
-    AddMessageHandler(new NewTabPageHandler());
-    AddMessageHandler(new FaviconWebUIHandler());
+    web_ui->AddMessageHandler(new NewTabPageHandler());
+    web_ui->AddMessageHandler(new FaviconWebUIHandler());
   }
 
   if (NTPLoginHandler::ShouldShow(GetProfile()))
-    AddMessageHandler(new NTPLoginHandler());
+    web_ui->AddMessageHandler(new NTPLoginHandler());
 
   // Initializing the CSS and HTML can require some CPU, so do it after
   // we've hooked up the most visited handler.  This allows the DB query
   // for the new tab thumbs to happen earlier.
   InitializeCSSCaches();
   NewTabHTMLSource* html_source =
       new NewTabHTMLSource(GetProfile()->GetOriginalProfile());
-  Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
-  profile->GetChromeURLDataManager()->AddDataSource(html_source);
+  GetProfile()->GetChromeURLDataManager()->AddDataSource(html_source);
 
   // Listen for theme installation.
   registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
                  content::Source<ThemeService>(
                      ThemeServiceFactory::GetForProfile(GetProfile())));
 }
 
 NewTabUI::~NewTabUI() {
   g_live_new_tabs.Pointer()->erase(this);
 }
@@ skipping 52 matching lines @@
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_BROWSER_THEME_CHANGED: {
       InitializeCSSCaches();
       ListValue args;
       args.Append(Value::CreateStringValue(
           ThemeServiceFactory::GetForProfile(GetProfile())->HasCustomImage(
               IDR_THEME_NTP_ATTRIBUTION) ?
           "true" : "false"));
-      CallJavascriptFunction("themeChanged", args);
+      web_ui()->CallJavascriptFunction("themeChanged", args);
       break;
     }
     case content::NOTIFICATION_RENDER_WIDGET_HOST_DID_PAINT: {
       last_paint_ = base::TimeTicks::Now();
       break;
     }
     default:
       CHECK(false) << "Unexpected notification: " << type;
   }
 }
@@ skipping 41 matching lines @@
       base::i18n::StringContainsStrongRTLChars(title)) {
     direction = kRTLHtmlTextDirection;
   } else {
     direction = kLTRHtmlTextDirection;
   }
   dictionary->SetString("title", title_to_set);
   dictionary->SetString("direction", direction);
 }
 
 // static
-NewTabUI* NewTabUI::FromWebUI(WebUI* ui) {
+NewTabUI* NewTabUI::FromWebUIController(content::WebUIController* ui) {
   if (!g_live_new_tabs.Pointer()->count(ui))
     return NULL;
   return static_cast<NewTabUI*>(ui);
 }
 
 Profile* NewTabUI::GetProfile() const {
-  return Profile::FromBrowserContext(web_contents()->GetBrowserContext());
+  return Profile::FromBrowserContext(
+      web_ui()->web_contents()->GetBrowserContext());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // NewTabHTMLSource
 
 NewTabUI::NewTabHTMLSource::NewTabHTMLSource(Profile* profile)
     : DataSource(chrome::kChromeUINewTabHost, MessageLoop::current()),
       profile_(profile) {
 }
 
@@ skipping 16 matching lines @@
   SendResponse(request_id, html_bytes);
 }
 
 std::string NewTabUI::NewTabHTMLSource::GetMimeType(const std::string&) const {
   return "text/html";
 }
 
 bool NewTabUI::NewTabHTMLSource::ShouldReplaceExistingSource() const {
   return false;
 }