chrome/browser/bookmarks/bookmark_model.cc - Issue 11428004: Sync the bookmark's icon URL

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/bookmarks/bookmark_model.cc

Issue 11428004: Sync the bookmark's icon URL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 8 years, 1 month 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/bookmarks/bookmark_model.cc

diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc

index e55e5529e0724d536dcf68383df74eda8bc182be..9e98e5fd28d6dae8499ea792cd6d37754cf41937 100644

--- a/chrome/browser/bookmarks/bookmark_model.cc

+++ b/chrome/browser/bookmarks/bookmark_model.cc

@@ -144,6 +144,7 @@ void BookmarkNode::Initialize(int64 id) {

}

void BookmarkNode::InvalidateFavicon() {

+ icon_url_ = GURL();

favicon_ = gfx::Image();

favicon_state_ = INVALID_FAVICON;

}

@@ -894,6 +895,7 @@ void BookmarkModel::OnFaviconDataAvailable(

node->set_favicon_state(BookmarkNode::LOADED_FAVICON);

if (!image_result.image.IsEmpty()) {

node->set_favicon(image_result.image);

+ node->set_icon_url(image_result.icon_url);

FaviconLoaded(node);

}