chrome/browser/ui/views/create_application_shortcut_view.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/ui/views/create_application_shortcut_view.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/ui/views/create_application_shortcut_view.cc

diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc

index 2e2079acf1c638de20c1a241071133871fd8c5d9..43c057def9607af581ba0316b14e148eae93b8b0 100644

--- a/chrome/browser/ui/views/create_application_shortcut_view.cc

+++ b/chrome/browser/ui/views/create_application_shortcut_view.cc

@@ -8,6 +8,7 @@

#include "base/utf_string_conversions.h"

#include "base/win/windows_version.h"

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

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

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

@@ -453,7 +454,7 @@ void CreateUrlApplicationShortcutView::FetchIcon() {

pending_download_ = new IconDownloadCallbackFunctor(this);

DCHECK(pending_download_);

- tab_contents_->tab_contents()->favicon_helper().DownloadImage(

+ tab_contents_->favicon_tab_helper()->DownloadImage(

unprocessed_icons_.back().url,

std::max(unprocessed_icons_.back().width,

unprocessed_icons_.back().height),