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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc

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/cocoa/tabs/tab_strip_controller.mm ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc
===================================================================
--- chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc (revision 80859)
+++ chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc (working copy)
@@ -8,7 +8,6 @@
#include "base/process_util.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/gtk/gtk_util.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
@@ -155,7 +154,7 @@
std::string title = UTF16ToUTF8(it->tab_contents()->GetTitle());
if (title.empty())
title = UTF16ToUTF8(TabContentsWrapper::GetDefaultTitle());
- SkBitmap favicon = it->favicon_tab_helper()->GetFavicon();
+ SkBitmap favicon = it->tab_contents()->GetFavicon();
GdkPixbuf* pixbuf = NULL;
if (favicon.width() > 0)
« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698