summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prerender
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-07 22:51:41 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-07 22:51:41 +0000
commit0150cfcb238a357ce4daaa9d9c6d5a4516f9a8eb (patch)
tree0a21f40d09ea0394e75f4c34d99ac07c5a74de8d /chrome/browser/prerender
parent9017a7808e576c7faac46695ab7845ec30434197 (diff)
downloadchromium_src-0150cfcb238a357ce4daaa9d9c6d5a4516f9a8eb.zip
chromium_src-0150cfcb238a357ce4daaa9d9c6d5a4516f9a8eb.tar.gz
chromium_src-0150cfcb238a357ce4daaa9d9c6d5a4516f9a8eb.tar.bz2
Revert 80519 - Move favicon from TabContents to TabContentsWrapper.
BUG=78732 Original BUG=71097 Original TEST=no visible change Original Review URL: http://codereview.chromium.org/6735042 TBR=avi@chromium.org Review URL: http://codereview.chromium.org/6814029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prerender')
-rw-r--r--chrome/browser/prerender/prerender_manager.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index bd39f9a6..4246d8f 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -9,11 +9,9 @@
#include "base/metrics/histogram.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
-#include "chrome/browser/favicon_tab_helper.h"
#include "chrome/browser/prerender/prerender_contents.h"
#include "chrome/browser/prerender/prerender_final_status.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/common/render_messages.h"
#include "content/browser/browser_thread.h"
#include "content/browser/renderer_host/render_view_host.h"
@@ -339,12 +337,8 @@ bool PrerenderManager::MaybeUsePreloadedPage(TabContents* tc, const GURL& url) {
tc->UpdateTitle(rvh, pc->page_id(), UTF16ToWideHack(title));
GURL icon_url = pc->icon_url();
- if (!icon_url.is_empty()) {
- // TODO(avi): move prerendering to use TCWs; remove this.
- TabContentsWrapper* wrapper =
- TabContentsWrapper::GetCurrentWrapperForContents(tc);
- wrapper->favicon_tab_helper()->OnUpdateFaviconURL(pc->page_id(), icon_url);
- }
+ if (!icon_url.is_empty())
+ tc->favicon_helper().OnUpdateFaviconURL(pc->page_id(), icon_url);
if (pc->has_stopped_loading())
tc->DidStopLoading();