Revert 80519 - Move favicon from TabContents to TabContentsWrapper.

chrome/browser/aeropeek_manager.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/aeropeek_manager.h"
 
 #include <dwmapi.h>
 #include <shobjidl.h>
 
 #include "app/win/shell.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_native_library.h"
 #include "base/scoped_comptr_win.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/scoped_hdc.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/app_icon_win.h"
 #include "chrome/browser/browser_process.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_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/backing_store.h"
 #include "content/browser/renderer_host/render_view_host.h"
@@ skipping 1032 matching lines @@
                                                       bool foreground) {
   if (GetAeroPeekWindow(GetTabID(tab->tab_contents())))
     return;
 
   AeroPeekWindow* window =
       new AeroPeekWindow(application_window_,
                          this,
                          GetTabID(tab->tab_contents()),
                          foreground,
                          tab->tab_contents()->GetTitle(),
-                         tab->favicon_tab_helper()->GetFavicon());
+                         tab->tab_contents()->GetFavicon());
   tab_list_.push_back(window);
 }
 
 TabContents* AeroPeekManager::GetTabContents(int tab_id) const {
   for (TabContentsIterator iterator; !iterator.done(); ++iterator) {
     TabContents* target_contents = (*iterator)->tab_contents();
     if (target_contents->controller().session_id().id() == tab_id)
       return target_contents;
   }
   return NULL;
@@ skipping 84 matching lines @@
       GetAeroPeekWindow(GetTabID(contents->tab_contents()));
   if (!window)
     return;
 
   // Update the title, the favicon, and the thumbnail used for AeroPeek.
   // These function don't actually update the icon and the thumbnail until
   // Windows needs them (e.g. when a user hovers a taskbar icon) to avoid
   // hurting the rendering performance. (These functions just save the
   // information needed for handling update requests from Windows.)
   window->SetTitle(contents->tab_contents()->GetTitle());
-  window->SetFavicon(contents->favicon_tab_helper()->GetFavicon());
+  window->SetFavicon(contents->tab_contents()->GetFavicon());
   window->Update(contents->tab_contents()->is_loading());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // AeroPeekManager, AeroPeekWindowDelegate implementation:
 
 void AeroPeekManager::ActivateTab(int tab_id) {
   // Ask TabStrip to activate this tab.
   // We don't have to update thumbnails now since TabStrip will call
   // TabSelectedAt() when it actually activates this tab.
@@ skipping 52 matching lines @@
   // This code is just copied from "thumbnail_generator.cc".
   skia::PlatformCanvas canvas;
   if (!backing_store->CopyFromBackingStore(gfx::Rect(backing_store->size()),
                                            &canvas))
     return false;
 
   const SkBitmap& bitmap = canvas.getTopPlatformDevice().accessBitmap(false);
   bitmap.copyTo(preview, SkBitmap::kARGB_8888_Config);
   return true;
 }