diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-20 18:01:28 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-20 18:01:28 +0000 |
| commit | ea2e5aa57f173880eabea2054729b5e1bc6b3560 (patch) | |
| tree | 131b44e7c74f50e1bd819680027d3fb589b156f0 /chrome/browser/views/bookmark_bar_view.cc | |
| parent | d47dbff4e1e960450c9a1b0666035de2fce88ee9 (diff) | |
| download | chromium_src-ea2e5aa57f173880eabea2054729b5e1bc6b3560.zip chromium_src-ea2e5aa57f173880eabea2054729b5e1bc6b3560.tar.gz chromium_src-ea2e5aa57f173880eabea2054729b5e1bc6b3560.tar.bz2 | |
Moves GetFavIcon from BookmarkNode to BookmarkModel. I'm doing this
for two reasons:
. it cuts down on each node needing a reference to the model.
. it makes it clear nodes shouldn't need to talk with the model.
I'm primarily doing this for the last point as I'm going to populate
nodes on a background thread shortly and I don't want to risk the
chance of someone trying to talk with the model.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/113617
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16491 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_bar_view.cc')
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 01bf014..a93387b 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -1228,8 +1228,8 @@ void BookmarkBarView::ConfigureButton(BookmarkNode* node, button->SetContextMenuController(this); button->SetDragController(this); if (node->is_url()) { - if (node->GetFavIcon().width() != 0) - button->SetIcon(node->GetFavIcon()); + if (model_->GetFavIcon(node).width() != 0) + button->SetIcon(model_->GetFavIcon(node)); else button->SetIcon(*kDefaultFavIcon); } |