chrome/browser/task_manager/task_manager_resource_providers.cc - Issue 6735042: Move favicon from TabContents to TabContentsWrapper.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/task_manager/task_manager_resource_providers.cc

Issue 6735042: Move favicon from TabContents to TabContentsWrapper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 9 years, 9 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:

Index: chrome/browser/task_manager/task_manager_resource_providers.cc

diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc

index d07ad29be7afa67550f1fb6b2e24efdc4bb514fa..e599d8f9adb088b5c2e5865b9d42b12bf752a7db 100644

--- a/chrome/browser/task_manager/task_manager_resource_providers.cc

+++ b/chrome/browser/task_manager/task_manager_resource_providers.cc

@@ -20,6 +20,7 @@

#include "chrome/browser/extensions/extension_host.h"

#include "chrome/browser/extensions/extension_process_manager.h"

#include "chrome/browser/extensions/extension_service.h"

+#include "chrome/browser/favicon_tab_helper.h"

#include "chrome/browser/notifications/balloon_collection.h"

#include "chrome/browser/notifications/balloon_host.h"

#include "chrome/browser/notifications/notification_ui_manager.h"

@@ -202,7 +203,7 @@ string16 TaskManagerTabContentsResource::GetTitle() const {

}

SkBitmap TaskManagerTabContentsResource::GetIcon() const {

- return tab_contents_->tab_contents()->GetFavicon();

+ return tab_contents_->favicon_tab_helper()->GetFavicon();

}

TabContentsWrapper* TaskManagerTabContentsResource::GetTabContents() const {

« no previous file with comments | « chrome/browser/prerender/prerender_manager.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »