Add a fallback to creation date for Recent bookmarks on NTP

components/ntp_snippets/bookmarks/bookmark_suggestions_provider.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/ntp_snippets/bookmarks/bookmark_suggestions_provider.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 10 matching lines @@
 #include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image.h"
 
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
 
 namespace {
 
 const int kMaxBookmarks = 10;
+const int kMinBookmarks = 3;
 const int kMaxBookmarkAgeInDays = 42;
 
 const char* kMaxBookmarksParamName = "max_count";
+const char* kMinBookmarksParamName = "min_count";
 const char* kMaxBookmarkAgeInDaysParamName = "max_age_in_days";

[Marc Treib, 2016/08/18 09:31:44]

Unrelated to this CL, but: AFAIK these param names must be unique within one
Finch config (which will span multiple features), so they should probably be a
bit more specific - "bookmarks_max_count" etc.

[Philipp Keck, 2016/08/19 11:20:54]

Done.

 
 base::Time GetThresholdTime() {
   std::string age_in_days_string = variations::GetVariationParamValueByFeature(
     ntp_snippets::kBookmarkSuggestionsFeature, kMaxBookmarkAgeInDaysParamName);
   int age_in_days = 0;
   if (!base::StringToInt(age_in_days_string, &age_in_days))
     age_in_days = kMaxBookmarkAgeInDays;
 
   return base::Time::Now() - base::TimeDelta::FromDays(age_in_days);
 }
 
 int GetMaxCount() {
   std::string max_count_string = variations::GetVariationParamValueByFeature(
-    ntp_snippets::kBookmarkSuggestionsFeature, kMaxBookmarksParamName);
+      ntp_snippets::kBookmarkSuggestionsFeature, kMaxBookmarksParamName);
   int max_count = 0;
   if (base::StringToInt(max_count_string, &max_count))
     return max_count;
 
   return kMaxBookmarks;
 }
 
+int GetMinCount() {
+  std::string min_count_string = variations::GetVariationParamValueByFeature(
+      ntp_snippets::kBookmarkSuggestionsFeature, kMinBookmarksParamName);
+  int min_count = 0;
+  if (base::StringToInt(min_count_string, &min_count))

[Marc Treib, 2016/08/18 09:31:44]

nit: If the string is non-empty but fails to parse, we might want to emit a
warning.

[Philipp Keck, 2016/08/19 11:20:54]

Done.

+    return min_count;
+
+  return kMinBookmarks;
+}
+
 }  // namespace
 
 namespace ntp_snippets {
 
 BookmarkSuggestionsProvider::BookmarkSuggestionsProvider(
     ContentSuggestionsProvider::Observer* observer,
     CategoryFactory* category_factory,
     bookmarks::BookmarkModel* bookmark_model)
     : ContentSuggestionsProvider(observer, category_factory),
       category_status_(CategoryStatus::AVAILABLE_LOADING),
@@ skipping 128 matching lines @@
   return suggestion;
 }
 
 void BookmarkSuggestionsProvider::FetchBookmarksInternal() {
   DCHECK(bookmark_model_->loaded());
 
   NotifyStatusChanged(CategoryStatus::AVAILABLE);
 
   base::Time threshold_time = GetThresholdTime();
   std::vector<const BookmarkNode*> bookmarks = GetRecentlyVisitedBookmarks(
-      bookmark_model_, GetMaxCount(), threshold_time);
+      bookmark_model_, GetMinCount(), GetMaxCount(),
+      threshold_time);
 
   std::vector<ContentSuggestion> suggestions;
   for (const BookmarkNode* bookmark : bookmarks)
     suggestions.emplace_back(ConvertBookmark(bookmark));
 
   if (suggestions.empty())
     end_of_list_last_visit_date_ = threshold_time;
   else
     end_of_list_last_visit_date_ = suggestions.back().publish_date();
 
@@ skipping 10 matching lines @@
 
 void BookmarkSuggestionsProvider::NotifyStatusChanged(
     CategoryStatus new_status) {
   if (category_status_ == new_status)
     return;
   category_status_ = new_status;
   observer()->OnCategoryStatusChanged(this, provided_category_, new_status);
 }
 
 }  // namespace ntp_snippets