chrome/browser/ui/tab_contents/tab_contents_wrapper.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/tab_contents/tab_contents_wrapper.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/tab_contents/tab_contents_wrapper.cc

diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

index 1ef716fee9f984751f21a9e4bcfef9d0b5270141..fd48b53a2e5fce6204eeb63f5f7eacf83e423642 100644

--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc

@@ -13,6 +13,7 @@

#include "chrome/browser/debugger/devtools_handler.h"

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

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

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

#include "chrome/browser/file_select_helper.h"

#include "chrome/browser/history/top_sites.h"

#include "chrome/browser/password_manager/password_manager.h"

@@ -56,6 +57,7 @@ TabContentsWrapper::TabContentsWrapper(TabContents* contents)

autocomplete_history_manager_.reset(new AutocompleteHistoryManager(contents));

autofill_manager_.reset(new AutofillManager(contents));

extension_tab_helper_.reset(new ExtensionTabHelper(this));

+ favicon_tab_helper_.reset(new FaviconTabHelper(contents));

find_tab_helper_.reset(new FindTabHelper(contents));

password_manager_delegate_.reset(new PasswordManagerDelegateImpl(contents));

password_manager_.reset(