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

chrome/browser/ui/bookmarks/bookmark_tab_helper.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/bookmarks/bookmark_tab_helper.h"
 
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/chrome_web_ui.h"
 #include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 
 namespace {
 
 bool CanShowBookmarkBar(WebUI* ui) {
   if (!ui)
     return false;
-  NewTabUI* new_tab = NewTabUI::FromWebUI(ui);
+  NewTabUI* new_tab = NewTabUI::FromWebUIController(ui->GetController());
   return new_tab && new_tab->CanShowBookmarkBar();
 }
 
 }  // namespace
 
 BookmarkTabHelper::BookmarkTabHelper(TabContentsWrapper* tab_contents)
     : content::WebContentsObserver(tab_contents->web_contents()),
       is_starred_(false),
       tab_contents_wrapper_(tab_contents),
       delegate_(NULL),
@@ skipping 71 matching lines @@
 void BookmarkTabHelper::UpdateStarredStateForCurrentURL() {
   Profile* profile =
       Profile::FromBrowserContext(web_contents()->GetBrowserContext());
   BookmarkModel* model = profile->GetBookmarkModel();
   const bool old_state = is_starred_;
   is_starred_ = (model && model->IsBookmarked(web_contents()->GetURL()));
 
   if (is_starred_ != old_state && delegate())
     delegate()->URLStarredChanged(tab_contents_wrapper_, is_starred_);
 }