Chromium Code Reviews| Index: components/ntp_snippets/bookmarks/bookmark_suggestions_provider.cc |
| diff --git a/components/ntp_snippets/bookmarks/bookmark_suggestions_provider.cc b/components/ntp_snippets/bookmarks/bookmark_suggestions_provider.cc |
| index 3ec810f69cf849546edec85006732fe6e8d2d587..b91c698ce1980dba7266e0a3f07c59fa717608ac 100644 |
| --- a/components/ntp_snippets/bookmarks/bookmark_suggestions_provider.cc |
| +++ b/components/ntp_snippets/bookmarks/bookmark_suggestions_provider.cc |
| @@ -209,7 +209,7 @@ void BookmarkSuggestionsProvider::GetDismissedSuggestionsForDebugging( |
| std::vector<ContentSuggestion> suggestions; |
| for (const BookmarkNode* bookmark : bookmarks) { |
| - ConvertBookmark(bookmark, &suggestions); |
| + ConvertBookmark(*bookmark, &suggestions); |
| } |
| callback.Run(std::move(suggestions)); |
| } |
| @@ -237,7 +237,7 @@ void BookmarkSuggestionsProvider::OnWillChangeBookmarkMetaInfo( |
| BookmarkModel* model, |
| const BookmarkNode* node) { |
| // Store the last visit date of the node that is about to change. |
| - if (!GetLastVisitDateForNTPBookmark(node, creation_date_fallback_, |
| + if (!GetLastVisitDateForNTPBookmark(*node, creation_date_fallback_, |
|
tschumann
2016/11/25 13:47:43
is |node| guaranteed to be non-null here and in Bo
jkrcal
2016/11/25 14:05:36
I am not sure. I see no info on this in BookmarkMo
sky
2016/11/28 16:25:09
They will never be null. I agree a const BookmarkN
|
| consider_bookmark_visits_from_desktop_, |
| &node_to_change_last_visit_date_)) { |
| node_to_change_last_visit_date_ = base::Time::UnixEpoch(); |
| @@ -248,7 +248,7 @@ void BookmarkSuggestionsProvider::BookmarkMetaInfoChanged( |
| BookmarkModel* model, |
| const BookmarkNode* node) { |
| base::Time time; |
| - if (!GetLastVisitDateForNTPBookmark(node, creation_date_fallback_, |
| + if (!GetLastVisitDateForNTPBookmark(*node, creation_date_fallback_, |
| consider_bookmark_visits_from_desktop_, |
| &time)) { |
| // Error in loading the last visit date after the change. This happens when |
| @@ -274,7 +274,7 @@ void BookmarkSuggestionsProvider::BookmarkNodeRemoved( |
| const bookmarks::BookmarkNode* node, |
| const std::set<GURL>& no_longer_bookmarked) { |
| base::Time time; |
| - if (GetLastVisitDateForNTPBookmark(node, creation_date_fallback_, |
| + if (GetLastVisitDateForNTPBookmark(*node, creation_date_fallback_, |
| consider_bookmark_visits_from_desktop_, |
| &time) && |
| time < end_of_list_last_visit_date_) { |
| @@ -292,7 +292,7 @@ void BookmarkSuggestionsProvider::BookmarkNodeAdded( |
| int index) { |
| base::Time time; |
| if (!GetLastVisitDateForNTPBookmark( |
| - parent->GetChild(index), creation_date_fallback_, |
| + *parent->GetChild(index), creation_date_fallback_, |
| consider_bookmark_visits_from_desktop_, &time) || |
| time < end_of_list_last_visit_date_) { |
| // The new node has no last visited info or is too old to get into the list. |
| @@ -304,7 +304,7 @@ void BookmarkSuggestionsProvider::BookmarkNodeAdded( |
| } |
| void BookmarkSuggestionsProvider::ConvertBookmark( |
| - const BookmarkNode* bookmark, |
| + const BookmarkNode& bookmark, |
| std::vector<ContentSuggestion>* suggestions) { |
| base::Time publish_date; |
| if (!GetLastVisitDateForNTPBookmark(bookmark, creation_date_fallback_, |
| @@ -313,12 +313,12 @@ void BookmarkSuggestionsProvider::ConvertBookmark( |
| return; |
| } |
| - ContentSuggestion suggestion(provided_category_, bookmark->url().spec(), |
| - bookmark->url()); |
| - suggestion.set_title(bookmark->GetTitle()); |
| + ContentSuggestion suggestion(provided_category_, bookmark.url().spec(), |
| + bookmark.url()); |
| + suggestion.set_title(bookmark.GetTitle()); |
| suggestion.set_snippet_text(base::string16()); |
| suggestion.set_publish_date(publish_date); |
| - suggestion.set_publisher_name(base::UTF8ToUTF16(bookmark->url().host())); |
| + suggestion.set_publisher_name(base::UTF8ToUTF16(bookmark.url().host())); |
| suggestions->emplace_back(std::move(suggestion)); |
| } |
| @@ -335,7 +335,7 @@ void BookmarkSuggestionsProvider::FetchBookmarksInternal() { |
| std::vector<ContentSuggestion> suggestions; |
| for (const BookmarkNode* bookmark : bookmarks) { |
| - ConvertBookmark(bookmark, &suggestions); |
| + ConvertBookmark(*bookmark, &suggestions); |
| } |
| if (suggestions.empty()) { |