diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 22:51:41 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-07 22:51:41 +0000 |
| commit | 0150cfcb238a357ce4daaa9d9c6d5a4516f9a8eb (patch) | |
| tree | 0a21f40d09ea0394e75f4c34d99ac07c5a74de8d /chrome/browser/chromeos/wm_overview_controller.cc | |
| parent | 9017a7808e576c7faac46695ab7845ec30434197 (diff) | |
| download | chromium_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/chromeos/wm_overview_controller.cc')
| -rw-r--r-- | chrome/browser/chromeos/wm_overview_controller.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/chromeos/wm_overview_controller.cc b/chrome/browser/chromeos/wm_overview_controller.cc index 11807ab..2914fb3 100644 --- a/chrome/browser/chromeos/wm_overview_controller.cc +++ b/chrome/browser/chromeos/wm_overview_controller.cc @@ -13,7 +13,6 @@ #include "chrome/browser/chromeos/wm_overview_favicon.h" #include "chrome/browser/chromeos/wm_overview_snapshot.h" #include "chrome/browser/chromeos/wm_overview_title.h" -#include "chrome/browser/favicon_tab_helper.h" #include "chrome/browser/tab_contents/thumbnail_generator.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" @@ -240,7 +239,7 @@ void BrowserListener::TabChangedAt( snapshots_[index].title->SetTitle(contents->tab_contents()->GetTitle()); snapshots_[index].title->SetUrl(contents->tab_contents()->GetURL()); snapshots_[index].favicon->SetFavicon( - contents->favicon_tab_helper()->GetFavicon()); + contents->tab_contents()->GetFavicon()); if (change_type != TabStripModelObserver::TITLE_NOT_LOADING) MarkSnapshotAsDirty(index); } @@ -425,9 +424,7 @@ void BrowserListener::InsertSnapshot(int index) { node.favicon = new WmOverviewFavicon; node.favicon->Init(node.snapshot); - node.favicon->SetFavicon( - browser_->GetTabContentsWrapperAt(index)-> - favicon_tab_helper()->GetFavicon()); + node.favicon->SetFavicon(browser_->GetTabContentsAt(index)->GetFavicon()); node.title = new WmOverviewTitle; node.title->Init(gfx::Size(std::max(0, cell_size.width() - |