Support server-provided category names.

components/ntp_snippets/ntp_snippets_service.cc

 // Copyright 2015 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/ntp_snippets_service.h"
 
 #include <algorithm>
 #include <iterator>
 #include <utility>
 
@@ skipping 203 matching lines @@
       image_decoder_(std::move(image_decoder)),
       database_(std::move(database)),
       snippets_status_service_(std::move(status_service)),
       fetch_after_load_(false),
       nuke_after_load_(false),
       thumbnail_requests_throttler_(
           pref_service,
           RequestThrottler::RequestType::CONTENT_SUGGESTION_THUMBNAIL) {
   // Articles category always exists; others will be added as needed.
   categories_[articles_category_] = CategoryContent();
+  categories_[articles_category_].localized_title =
+      l10n_util::GetStringUTF16(IDS_NTP_ARTICLE_SUGGESTIONS_SECTION_HEADER);
   observer->OnCategoryStatusChanged(this, articles_category_,
                                     categories_[articles_category_].status);
   if (database_->IsErrorState()) {
     EnterState(State::ERROR_OCCURRED);
     UpdateAllCategoryStatus(CategoryStatus::LOADING_ERROR);
     return;
   }
 
   // Can be null in tests.
   if (history_service)
@@ skipping 65 matching lines @@
   }
 }
 
 CategoryStatus NTPSnippetsService::GetCategoryStatus(Category category) {
   DCHECK(categories_.find(category) != categories_.end());
   return categories_[category].status;
 }
 
 CategoryInfo NTPSnippetsService::GetCategoryInfo(Category category) {
   DCHECK(categories_.find(category) != categories_.end());
-  // TODO(sfiera): pass back titles for server categories.
-  return CategoryInfo(
-      l10n_util::GetStringUTF16(IDS_NTP_ARTICLE_SUGGESTIONS_SECTION_HEADER),
-      ContentSuggestionsCardLayout::FULL_CARD,
-      /* has_more_button */ false,
-      /* show_if_empty */ true);
+  const CategoryContent& content = categories_[category];
+  return CategoryInfo(content.localized_title,
+                      ContentSuggestionsCardLayout::FULL_CARD,
+                      /* has_more_button */ false,
+                      /* show_if_empty */ true);
 }
 
 void NTPSnippetsService::DismissSuggestion(const std::string& suggestion_id) {
   if (!ready())
     return;
 
   Category category = GetCategoryFromUniqueID(suggestion_id);
   std::string snippet_id = GetWithinCategoryIDFromUniqueID(suggestion_id);
 
   DCHECK(categories_.find(category) != categories_.end());
@@ skipping 226 matching lines @@
     return;
 
   for (auto& item : categories_) {
     CategoryContent* content = &item.second;
     content->provided_by_server = false;
   }
 
   // If snippets were fetched successfully, update our |categories_| from each
   // category provided by the server.
   if (snippets) {
-    for (std::pair<const Category, NTPSnippet::PtrVector>& item : *snippets) {
-      Category category = item.first;
-      NTPSnippet::PtrVector& new_snippets = item.second;
+    for (NTPSnippetsFetcher::FetchedCategory& fetched_category : *snippets) {
+      Category category = fetched_category.category;
+
+      if (category != articles_category_) {

[tschumann, 2016/08/29 09:59:53]

note: special casing the articles category like this is probably fine for now,
but we should find a better way at some point (right now, we hard-code this
here, in the constructor and maybe in other places).

It might also be cleaner to make the original intent clear,like only updating
titles for server-side categories. e.g.
if (!category.IsKnownCategory(KnownCategories::ARTICLES)) {
  // Only update titles from server-side provided categories.
  ...
}

[Michael van Ouwerkerk, 2016/09/08 13:03:27]

The form of "category != articles_category_" is used throughout this file, so
for consistency I'll keep that. The comment seems a good idea, done.

+        categories_[category].localized_title =
+            fetched_category.localized_title;
+      }
 
       DCHECK_LE(snippets->size(), static_cast<size_t>(kMaxSnippetCount));
       // TODO(sfiera): histograms for server categories.
       // Sparse histogram used because the number of snippets is small (bound by
       // kMaxSnippetCount).
       if (category == articles_category_) {
         UMA_HISTOGRAM_SPARSE_SLOWLY("NewTabPage.Snippets.NumArticlesFetched",
-                                    new_snippets.size());
+                                    fetched_category.snippets.size());
       }
 
-      MergeSnippets(category, std::move(new_snippets));
+      MergeSnippets(category, std::move(fetched_category.snippets));
 
       // If there are more snippets than we want to show, delete the extra ones.
       CategoryContent* content = &categories_[category];
       content->provided_by_server = true;
       if (content->snippets.size() > kMaxSnippetCount) {
         NTPSnippet::PtrVector to_delete(
             std::make_move_iterator(content->snippets.begin() +
                                     kMaxSnippetCount),
             std::make_move_iterator(content->snippets.end()));
         content->snippets.resize(kMaxSnippetCount);
@@ skipping 477 matching lines @@
 }
 
 NTPSnippetsService::CategoryContent::CategoryContent() = default;
 NTPSnippetsService::CategoryContent::CategoryContent(CategoryContent&&) =
     default;
 NTPSnippetsService::CategoryContent::~CategoryContent() = default;
 NTPSnippetsService::CategoryContent& NTPSnippetsService::CategoryContent::
 operator=(CategoryContent&&) = default;
 
 }  // namespace ntp_snippets