Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1074)

Unified Diff: chrome/browser/ui/cocoa/hung_renderer_controller.mm

Issue 6814029: Revert 80519 - Move favicon from TabContents to TabContentsWrapper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/hung_renderer_controller.mm
===================================================================
--- chrome/browser/ui/cocoa/hung_renderer_controller.mm (revision 80859)
+++ chrome/browser/ui/cocoa/hung_renderer_controller.mm (working copy)
@@ -148,7 +148,7 @@
// TabContents can return a null SkBitmap if it has no favicon. If this
// happens, use the default favicon.
- const SkBitmap& bitmap = it->favicon_tab_helper()->GetFavicon();
+ const SkBitmap& bitmap = it->tab_contents()->GetFavicon();
if (!bitmap.isNull()) {
[favicons addObject:gfx::SkBitmapToNSImage(bitmap)];
} else {
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698