Clean up TCW, make it solely a hub for 1:1 observer/helper objects.

chrome/browser/ui/web_applications/web_app_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/web_applications/web_app_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 83 matching lines @@
 
 UpdateShortcutWorker::UpdateShortcutWorker(TabContentsWrapper* tab_contents)
     : tab_contents_(tab_contents),
       profile_path_(tab_contents->profile()->GetPath()) {
   web_app::GetShortcutInfoForTab(tab_contents_, &shortcut_info_);
   web_app::GetIconsInfo(tab_contents_->extension_tab_helper()->web_app_info(),
                         &unprocessed_icons_);
   file_name_ = web_app::internals::GetSanitizedFileName(shortcut_info_.title);
 
   registrar_.Add(
-      this, content::NOTIFICATION_TAB_CLOSING,
-      content::Source<NavigationController>(&tab_contents_->controller()));
+      this,
+      content::NOTIFICATION_TAB_CLOSING,
+      content::Source<NavigationController>(
+          &tab_contents_->tab_contents()->controller()));
 }
 
 void UpdateShortcutWorker::Run() {
   // Starting by downloading app icon.
   DownloadIcon();
 }
 
 void UpdateShortcutWorker::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_TAB_CLOSING &&
       content::Source<NavigationController>(source).ptr() ==
-        &tab_contents_->controller()) {
+        &tab_contents_->tab_contents()->controller()) {
     // Underlying tab is closing.
     tab_contents_ = NULL;
   }
 }
 
 void UpdateShortcutWorker::DownloadIcon() {
   // FetchIcon must run on UI thread because it relies on TabContents
   // to download the icon.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ skipping 180 matching lines @@
 
 void UpdateShortcutForTabContents(TabContentsWrapper* tab_contents) {
 #if defined(OS_WIN)
   // UpdateShortcutWorker will delete itself when it's done.
   UpdateShortcutWorker* worker = new UpdateShortcutWorker(tab_contents);
   worker->Run();
 #endif  // defined(OS_WIN)
 }
 
 }  // namespace web_app