diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 18:54:05 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-16 18:54:05 +0000 |
| commit | f16039d23043cf97048540b3916be44825697f9b (patch) | |
| tree | 4f607808a77397f26cbca4935b5996abdc188796 /chrome/browser/bookmarks | |
| parent | f660caef294d1ad42142b8a500da4ea49af2a4bf (diff) | |
| download | chromium_src-f16039d23043cf97048540b3916be44825697f9b.zip chromium_src-f16039d23043cf97048540b3916be44825697f9b.tar.gz chromium_src-f16039d23043cf97048540b3916be44825697f9b.tar.bz2 | |
fav icon -> favicon. Pass 12/12: all the rest
BUG=76073
TEST=test; no visible change
Review URL: http://codereview.chromium.org/6667044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_model.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index 230e9d1..da57dff 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -737,7 +737,7 @@ BookmarkNode* BookmarkModel::CreateRootNodeFromStarredEntry( void BookmarkModel::OnFaviconDataAvailable( FaviconService::Handle handle, history::FaviconData favicon) { - SkBitmap fav_icon; + SkBitmap favicon_bitmap; BookmarkNode* node = load_consumer_.GetClientData( profile_->GetFaviconService(Profile::EXPLICIT_ACCESS), handle); @@ -745,8 +745,8 @@ void BookmarkModel::OnFaviconDataAvailable( node->set_favicon_load_handle(0); if (favicon.is_valid() && gfx::PNGCodec::Decode(favicon.image_data->front(), favicon.image_data->size(), - &fav_icon)) { - node->set_favicon(fav_icon); + &favicon_bitmap)) { + node->set_favicon(favicon_bitmap); FaviconLoaded(node); } } |