Move favicon from TabContents to TabContentsWrapper.

chrome/browser/ui/cocoa/hung_renderer_controller.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/hung_renderer_controller.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/mac_util.h"
 #include "base/process_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #import "chrome/browser/ui/cocoa/multi_key_equivalent_button.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/logging_chrome.h"
+#include "chrome/browser/favicon_tab_helper.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/app_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
@@ skipping 113 matching lines @@
   for (TabContentsIterator it; !it.done(); ++it) {
     if (it->tab_contents()->GetRenderProcessHost() ==
         hungContents_->GetRenderProcessHost()) {
       string16 title = (*it)->tab_contents()->GetTitle();
       if (title.empty())
         title = TabContentsWrapper::GetDefaultTitle();
       [titles addObject:base::SysUTF16ToNSString(title)];
 
       // TabContents can return a null SkBitmap if it has no favicon.  If this
       // happens, use the default favicon.
-      const SkBitmap& bitmap = it->tab_contents()->GetFavicon();
+      const SkBitmap& bitmap = it->favicon_tab_helper()->GetFavicon();
       if (!bitmap.isNull()) {
         [favicons addObject:gfx::SkBitmapToNSImage(bitmap)];
       } else {
         ResourceBundle& rb = ResourceBundle::GetSharedInstance();
         [favicons addObject:rb.GetNativeImageNamed(IDR_DEFAULT_FAVICON)];
       }
     }
   }
   hungTitles_.reset([titles copy]);
   hungFavicons_.reset([favicons copy]);
@@ skipping 35 matching lines @@
     [g_instance showForTabContents:contents];
   }
 }
 
 void HideHungRendererDialog(TabContents* contents) {
   if (!logging::DialogsAreSuppressed() && g_instance)
     [g_instance endForTabContents:contents];
 }
 
 }  // namespace browser