Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1173)

Unified Diff: components/bookmarks/browser/bookmark_model.cc

Issue 763903003: bookmarks: Only try to get favicon for URL nodes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/bookmarks/browser/bookmark_model.cc
diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
index 5fadefbb3e9dbc468fe1e98fccc2d127adb3d10f..c66e86e52aadf5ab3a2e25ebecf5c5b09c452d23 100644
--- a/components/bookmarks/browser/bookmark_model.cc
+++ b/components/bookmarks/browser/bookmark_model.cc
@@ -303,11 +303,9 @@ const gfx::Image& BookmarkModel::GetFavicon(const BookmarkNode* node) {
DCHECK(node);
if (node->favicon_state() == BookmarkNode::INVALID_FAVICON) {
BookmarkNode* mutable_node = AsMutable(node);
- LoadFavicon(
- mutable_node,
- client_->PreferTouchIcon() ?
- favicon_base::TOUCH_ICON :
- favicon_base::FAVICON);
+ LoadFavicon(mutable_node,
+ client_->PreferTouchIcon() ? favicon_base::TOUCH_ICON
+ : favicon_base::FAVICON);
}
return node->favicon();
}
@@ -966,9 +964,8 @@ void BookmarkModel::OnFaviconDataAvailable(
}
}
-void BookmarkModel::LoadFavicon(
- BookmarkNode* node,
- favicon_base::IconType icon_type) {
+void BookmarkModel::LoadFavicon(BookmarkNode* node,
+ favicon_base::IconType icon_type) {
if (node->is_folder())
return;
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698