Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/chromeos/wm_overview_controller.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/chromeos/wm_overview_controller.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/memory/linked_ptr.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
 #include "chrome/browser/chromeos/wm_overview_favicon.h"
 #include "chrome/browser/chromeos/wm_overview_snapshot.h"
 #include "chrome/browser/chromeos/wm_overview_title.h"
-#include "chrome/browser/favicon_tab_helper.h"
 #include "chrome/browser/tab_contents/thumbnail_generator.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
@@ skipping 206 matching lines @@
 }
 
 void BrowserListener::TabChangedAt(
     TabContentsWrapper* contents,
     int index,
     TabStripModelObserver::TabChangeType change_type) {
   if (change_type != TabStripModelObserver::LOADING_ONLY) {
     snapshots_[index].title->SetTitle(contents->tab_contents()->GetTitle());
     snapshots_[index].title->SetUrl(contents->tab_contents()->GetURL());
     snapshots_[index].favicon->SetFavicon(
-        contents->favicon_tab_helper()->GetFavicon());
+        contents->tab_contents()->GetFavicon());
     if (change_type != TabStripModelObserver::TITLE_NOT_LOADING)
       MarkSnapshotAsDirty(index);
   }
 }
 
 void BrowserListener::TabStripEmpty() {
   snapshots_.clear();
 }
 
 void BrowserListener::TabSelectedAt(TabContentsWrapper* old_contents,
@@ skipping 164 matching lines @@
 }
 
 void BrowserListener::InsertSnapshot(int index) {
   SnapshotNode node;
   node.snapshot = new WmOverviewSnapshot;
   gfx::Size cell_size = CalculateCellSize();
   node.snapshot->Init(cell_size, browser_, index);
 
   node.favicon = new WmOverviewFavicon;
   node.favicon->Init(node.snapshot);
-  node.favicon->SetFavicon(
-      browser_->GetTabContentsWrapperAt(index)->
-          favicon_tab_helper()->GetFavicon());
+  node.favicon->SetFavicon(browser_->GetTabContentsAt(index)->GetFavicon());
 
   node.title = new WmOverviewTitle;
   node.title->Init(gfx::Size(std::max(0, cell_size.width() -
                                       WmOverviewFavicon::kIconSize -
                                       kFaviconPadding),
                              kTitleHeight), node.snapshot);
   node.title->SetTitle(browser_->GetTabContentsAt(index)->GetTitle());
 
   snapshots_.insert(snapshots_.begin() + index, node);
   node.snapshot->reload_snapshot();
@@ skipping 300 matching lines @@
     if (item.get() == NULL) {
       item = BrowserListenerVector::value_type(
           new BrowserListener(*iterator, this));
     }
     listeners_.push_back(item);
     ++iterator;
   }
 }
 
 }  // namespace chromeos