Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/ui/views/hung_renderer_view.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/browser_dialogs.h"
 
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/favicon_tab_helper.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/logging_chrome.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/result_codes.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ skipping 29 matching lines @@
   void InitForTabContents(TabContents* hung_contents);
 
   // Overridden from views::GroupTableModel:
   virtual int RowCount();
   virtual string16 GetText(int row, int column_id);
   virtual SkBitmap GetIcon(int row);
   virtual void SetObserver(ui::TableModelObserver* observer);
   virtual void GetGroupRangeForItem(int item, views::GroupRange* range);
 
  private:
-  typedef std::vector<TabContentsWrapper*> TabContentsVector;
+  typedef std::vector<TabContents*> TabContentsVector;
   TabContentsVector tab_contentses_;
 
   ui::TableModelObserver* observer_;
 
   DISALLOW_COPY_AND_ASSIGN(HungPagesTableModel);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // HungPagesTableModel, public:
 
 HungPagesTableModel::HungPagesTableModel() : observer_(NULL) {
 }
 
 HungPagesTableModel::~HungPagesTableModel() {
 }
 
 void HungPagesTableModel::InitForTabContents(TabContents* hung_contents) {
   tab_contentses_.clear();
   for (TabContentsIterator it; !it.done(); ++it) {
     if (it->tab_contents()->GetRenderProcessHost() ==
         hung_contents->GetRenderProcessHost())
-      tab_contentses_.push_back(*it);
+      tab_contentses_.push_back((*it)->tab_contents());
   }
   // The world is different.
   if (observer_)
     observer_->OnModelChanged();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // HungPagesTableModel, views::GroupTableModel implementation:
 
 int HungPagesTableModel::RowCount() {
   return static_cast<int>(tab_contentses_.size());
 }
 
 string16 HungPagesTableModel::GetText(int row, int column_id) {
   DCHECK(row >= 0 && row < RowCount());
-  string16 title = tab_contentses_[row]->tab_contents()->GetTitle();
+  string16 title = tab_contentses_[row]->GetTitle();
   if (title.empty())
     title = TabContentsWrapper::GetDefaultTitle();
   // TODO(xji): Consider adding a special case if the title text is a URL,
   // since those should always have LTR directionality. Please refer to
   // http://crbug.com/6726 for more information.
   base::i18n::AdjustStringForLocaleDirection(&title);
   return title;
 }
 
 SkBitmap HungPagesTableModel::GetIcon(int row) {
   DCHECK(row >= 0 && row < RowCount());
-  return tab_contentses_.at(row)->favicon_tab_helper()->GetFavicon();
+  return tab_contentses_.at(row)->GetFavicon();
 }
 
 void HungPagesTableModel::SetObserver(ui::TableModelObserver* observer) {
   observer_ = observer;
 }
 
 void HungPagesTableModel::GetGroupRangeForItem(int item,
                                                views::GroupRange* range) {
   DCHECK(range);
   range->start = 0;
@@ skipping 338 matching lines @@
     g_instance->ShowForTabContents(contents);
   }
 }
 
 void HideHungRendererDialog(TabContents* contents) {
   if (!logging::DialogsAreSuppressed() && g_instance)
     g_instance->EndForTabContents(contents);
 }
 
 }  // namespace browser