| Index: components/ntp_snippets/bookmarks/bookmark_last_visit_utils.cc
|
| diff --git a/components/ntp_snippets/bookmarks/bookmark_last_visit_utils.cc b/components/ntp_snippets/bookmarks/bookmark_last_visit_utils.cc
|
| index 44f499bb42da0b15a82d68ac5b5d41dcfa4e8e7f..937de28ab7f7f6f1abdea005377fd132206e2e71 100644
|
| --- a/components/ntp_snippets/bookmarks/bookmark_last_visit_utils.cc
|
| +++ b/components/ntp_snippets/bookmarks/bookmark_last_visit_utils.cc
|
| @@ -77,7 +77,7 @@ std::vector<const BookmarkNode*>::const_iterator FindMostRecentBookmark(
|
|
|
| for (auto iter = bookmarks.begin(); iter != bookmarks.end(); ++iter) {
|
| base::Time last_visited;
|
| - if (GetLastVisitDateForNTPBookmark(*iter, creation_date_fallback,
|
| + if (GetLastVisitDateForNTPBookmark(**iter, creation_date_fallback,
|
| consider_visits_from_desktop,
|
| &last_visited) &&
|
| most_recent_last_visited <= last_visited) {
|
| @@ -119,21 +119,21 @@ void UpdateBookmarkOnURLVisitedInMainFrame(BookmarkModel* bookmark_model,
|
| }
|
| }
|
|
|
| -bool GetLastVisitDateForNTPBookmark(const BookmarkNode* node,
|
| +bool GetLastVisitDateForNTPBookmark(const BookmarkNode& node,
|
| bool creation_date_fallback,
|
| bool consider_visits_from_desktop,
|
| base::Time* out) {
|
| - if (!node || IsDismissedFromNTPForBookmark(node)) {
|
| + if (IsDismissedFromNTPForBookmark(node)) {
|
| return false;
|
| }
|
|
|
| bool got_mobile_date =
|
| - ExtractLastVisitDate(*node, kBookmarkLastVisitDateOnMobileKey, out);
|
| + ExtractLastVisitDate(node, kBookmarkLastVisitDateOnMobileKey, out);
|
|
|
| if (consider_visits_from_desktop) {
|
| // Consider the later visit from these two platform groups.
|
| base::Time last_visit_desktop;
|
| - if (ExtractLastVisitDate(*node, kBookmarkLastVisitDateOnDesktopKey,
|
| + if (ExtractLastVisitDate(node, kBookmarkLastVisitDateOnDesktopKey,
|
| &last_visit_desktop)) {
|
| if (!got_mobile_date) {
|
| *out = last_visit_desktop;
|
| @@ -145,7 +145,7 @@ bool GetLastVisitDateForNTPBookmark(const BookmarkNode* node,
|
| }
|
|
|
| if (!got_mobile_date && creation_date_fallback) {
|
| - *out = node->date_added();
|
| + *out = node.date_added();
|
| return true;
|
| }
|
|
|
| @@ -160,14 +160,10 @@ void MarkBookmarksDismissed(BookmarkModel* bookmark_model, const GURL& url) {
|
| }
|
| }
|
|
|
| -bool IsDismissedFromNTPForBookmark(const BookmarkNode* node) {
|
| - if (!node) {
|
| - return false;
|
| - }
|
| -
|
| +bool IsDismissedFromNTPForBookmark(const BookmarkNode& node) {
|
| std::string dismissed_from_ntp;
|
| bool result =
|
| - node->GetMetaInfo(kBookmarkDismissedFromNTP, &dismissed_from_ntp);
|
| + node.GetMetaInfo(kBookmarkDismissedFromNTP, &dismissed_from_ntp);
|
| DCHECK(!result || dismissed_from_ntp == "1");
|
| return result;
|
| }
|
| @@ -223,7 +219,7 @@ std::vector<const BookmarkNode*> GetRecentlyVisitedBookmarks(
|
|
|
| // Extract the last visit of the node to use later for sorting.
|
| base::Time last_visit;
|
| - if (!GetLastVisitDateForNTPBookmark(*most_recent, creation_date_fallback,
|
| + if (!GetLastVisitDateForNTPBookmark(**most_recent, creation_date_fallback,
|
| consider_visits_from_desktop,
|
| &last_visit)) {
|
| continue;
|
| @@ -232,7 +228,7 @@ std::vector<const BookmarkNode*> GetRecentlyVisitedBookmarks(
|
| // Has it been _visited_ recently enough (not considering creation date)?
|
| base::Time last_real_visit;
|
| if (GetLastVisitDateForNTPBookmark(
|
| - *most_recent, /*creation_date_fallback=*/false,
|
| + **most_recent, /*creation_date_fallback=*/false,
|
| consider_visits_from_desktop, &last_real_visit) &&
|
| min_visit_time < last_real_visit) {
|
| recently_visited_count++;
|
| @@ -302,7 +298,7 @@ std::vector<const BookmarkNode*> GetDismissedBookmarksForDebugging(
|
| DCHECK(!bookmarks_for_url.empty());
|
|
|
| for (const BookmarkNode* node : bookmarks_for_url) {
|
| - if (!IsDismissedFromNTPForBookmark(node)) {
|
| + if (!IsDismissedFromNTPForBookmark(*node)) {
|
| return true;
|
| }
|
| }
|
|
|