chrome/browser/history/chrome_history_client.cc - Issue 1133463005: Update all bookmarks which use an icon URL when a favicon's bitmap is updated

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/history/chrome_history_client.cc

Issue 1133463005: Update all bookmarks which use an icon URL when a favicon's bitmap is updated (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@startup_do_not_unexpire

Patch Set: Created 5 years, 5 months 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/history/chrome_history_client.h ('k') | chrome/browser/sync/sessions/notification_service_sessions_router.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/history/chrome_history_client.cc

diff --git a/chrome/browser/history/chrome_history_client.cc b/chrome/browser/history/chrome_history_client.cc

index c5d70c4375c41bc789ad44a1548a8741ecd75c19..be960fa242496d23458e0896e5fc74d73ac89730 100644

--- a/chrome/browser/history/chrome_history_client.cc

+++ b/chrome/browser/history/chrome_history_client.cc

@@ -31,9 +31,10 @@ void ChromeHistoryClient::OnHistoryServiceCreated(

on_bookmarks_removed_ =

base::Bind(&history::HistoryService::URLsNoLongerBookmarked,

base::Unretained(history_service));

- favicon_changed_subscription_ = history_service->AddFaviconChangedCallback(

- base::Bind(&bookmarks::BookmarkModel::OnFaviconChanged,

- base::Unretained(bookmark_model_)));

+ favicons_changed_subscription_ =

+ history_service->AddFaviconsChangedCallback(

+ base::Bind(&bookmarks::BookmarkModel::OnFaviconsChanged,

+ base::Unretained(bookmark_model_)));

bookmark_model_->AddObserver(this);

is_bookmark_model_observer_ = true;

}

@@ -51,7 +52,7 @@ void ChromeHistoryClient::Shutdown() {

if (is_bookmark_model_observer_) {

is_bookmark_model_observer_ = false;

bookmark_model_->RemoveObserver(this);

- favicon_changed_subscription_.reset();

+ favicons_changed_subscription_.reset();

on_bookmarks_removed_.Reset();

}

bookmark_model_->Shutdown();