Add ContentSuggestionsCategoryFactory; Store categories as ints

components/ntp_snippets/content_suggestions_service.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/content_suggestions_service.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/strings/string_number_conversions.h"
 #include "ui/gfx/image/image.h"
 
 namespace ntp_snippets {
 
+bool ContentSuggestionsService::CompareCategoriesByID::operator()(
+    const ContentSuggestionsCategory& left,
+    const ContentSuggestionsCategory& right) const {
+  return left.id() < right.id();
+}
+
 ContentSuggestionsService::ContentSuggestionsService(State state)
     : state_(state) {}
 
 ContentSuggestionsService::~ContentSuggestionsService() {}
 
 void ContentSuggestionsService::Shutdown() {
   DCHECK(providers_.empty());
   DCHECK(categories_.empty());
   DCHECK(suggestions_by_category_.empty());
   DCHECK(id_category_map_.empty());
@@ skipping 25 matching lines @@
 }
 
 void ContentSuggestionsService::FetchSuggestionImage(
     const std::string& suggestion_id,
     const ImageFetchedCallback& callback) {
   if (!id_category_map_.count(suggestion_id)) {
     LOG(WARNING) << "Requested image for unknown suggestion " << suggestion_id;
     callback.Run(suggestion_id, gfx::Image());
     return;
   }
-  ContentSuggestionsCategory category = id_category_map_[suggestion_id];
+  ContentSuggestionsCategory category = id_category_map_.at(suggestion_id);
   if (!providers_.count(category)) {
     LOG(WARNING) << "Requested image for suggestion " << suggestion_id
-                 << " for unavailable category " << static_cast<int>(category);
+                 << " for unavailable category " << category.id();
     callback.Run(suggestion_id, gfx::Image());
     return;
   }
   providers_[category]->FetchSuggestionImage(suggestion_id, callback);
 }
 
 void ContentSuggestionsService::ClearCachedSuggestionsForDebugging() {
   suggestions_by_category_.clear();
   id_category_map_.clear();
   for (auto& category_provider_pair : providers_) {
     category_provider_pair.second->ClearCachedSuggestionsForDebugging();
   }
   FOR_EACH_OBSERVER(Observer, observers_, OnNewSuggestions());
 }
 
 void ContentSuggestionsService::ClearDismissedSuggestionsForDebugging() {
   for (auto& category_provider_pair : providers_) {
     category_provider_pair.second->ClearDismissedSuggestionsForDebugging();
   }
 }
 
 void ContentSuggestionsService::DismissSuggestion(
     const std::string& suggestion_id) {
   if (!id_category_map_.count(suggestion_id)) {
     LOG(WARNING) << "Dismissed unknown suggestion " << suggestion_id;
     return;
   }
-  ContentSuggestionsCategory category = id_category_map_[suggestion_id];
+  ContentSuggestionsCategory category = id_category_map_.at(suggestion_id);
   if (!providers_.count(category)) {
     LOG(WARNING) << "Dismissed suggestion " << suggestion_id
-                 << " for unavailable category " << static_cast<int>(category);
+                 << " for unavailable category " << category.id();
     return;
   }
   providers_[category]->DismissSuggestion(suggestion_id);
 
   // Remove the suggestion locally.
   id_category_map_.erase(suggestion_id);
   std::vector<ContentSuggestion>* suggestions =
       &suggestions_by_category_[category];
   auto position =
       std::find_if(suggestions->begin(), suggestions->end(),
@@ skipping 18 matching lines @@
 void ContentSuggestionsService::RegisterProvider(
     ContentSuggestionsProvider* provider) {
   // TODO(pke): When NTPSnippetsService is purely a provider, think about
   // removing this state check.
   if (state_ == State::DISABLED)
     return;
 
   for (ContentSuggestionsCategory category : provider->provided_categories()) {
     DCHECK_EQ(0ul, providers_.count(category));
     providers_[category] = provider;
-    // TODO(pke): In the future, make sure that the categories have some useful
-    // (maybe constant, at least consistent) ordering for the UI.
     categories_.push_back(category);
     if (IsContentSuggestionsCategoryStatusAvailable(
             provider->GetCategoryStatus(category))) {
       suggestions_by_category_[category] = std::vector<ContentSuggestion>();
     }
     NotifyCategoryStatusChanged(category);
   }
+  std::sort(categories_.begin(), categories_.end(),
+            [this](const ContentSuggestionsCategory& left,
+                   const ContentSuggestionsCategory& right) {
+              return category_factory_.CompareCategories(left, right);
+            });
   provider->SetObserver(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Private methods
 
 void ContentSuggestionsService::OnNewSuggestions(
     ContentSuggestionsCategory changed_category,
     std::vector<ContentSuggestion> new_suggestions) {
   DCHECK(IsCategoryRegistered(changed_category));
 
   for (const ContentSuggestion& suggestion :
        suggestions_by_category_[changed_category]) {
     id_category_map_.erase(suggestion.id());
   }
 
-  for (const ContentSuggestion& suggestion : new_suggestions) {
-    id_category_map_[suggestion.id()] = changed_category;
+  for (ContentSuggestion& suggestion : new_suggestions) {

[Marc Treib, 2016/07/28 11:41:46]

Why'd you remove the "const"?

[Philipp Keck, 2016/07/28 13:50:54]

That was unintentional.

+    id_category_map_.insert(std::make_pair(suggestion.id(), changed_category));
   }
 
   suggestions_by_category_[changed_category] = std::move(new_suggestions);
 
   FOR_EACH_OBSERVER(Observer, observers_, OnNewSuggestions());
 }
 
 void ContentSuggestionsService::OnCategoryStatusChanged(
     ContentSuggestionsCategory changed_category,
     ContentSuggestionsCategoryStatus new_status) {
@@ skipping 30 matching lines @@
 }
 
 void ContentSuggestionsService::NotifyCategoryStatusChanged(
     ContentSuggestionsCategory category) {
   FOR_EACH_OBSERVER(
       Observer, observers_,
       OnCategoryStatusChanged(category, GetCategoryStatus(category)));
 }
 
 }  // namespace ntp_snippets