Add ContentSuggestionsCategoryFactory; Store categories as ints

chrome/browser/ui/webui/snippets_internals_message_handler.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 "chrome/browser/ui/webui/snippets_internals_message_handler.h"
 
 #include <memory>
 #include <set>
 #include <vector>
 
@@ skipping 11 matching lines @@
 #include "chrome/browser/ntp_snippets/content_suggestions_service_factory.h"
 #include "chrome/browser/ntp_snippets/ntp_snippets_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "components/ntp_snippets/ntp_snippet.h"
 #include "components/ntp_snippets/switches.h"
 #include "content/public/browser/web_ui.h"
 
 using ntp_snippets::ContentSuggestion;
 using ntp_snippets::ContentSuggestionsCategory;
 using ntp_snippets::ContentSuggestionsCategoryStatus;
+using ntp_snippets::KnownSuggestionsCategories;
 
 namespace {
 
 std::unique_ptr<base::DictionaryValue> PrepareSnippet(
     const ntp_snippets::NTPSnippet& snippet,
     int index,
     bool dismissed) {
   std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue);
   entry->SetString("snippetId", snippet.id());
   entry->SetString("title", snippet.title());
@@ skipping 25 matching lines @@
   entry->SetString("ampUrl", suggestion.amp_url().spec());
   entry->SetString("title", suggestion.title());
   entry->SetString("snippetText", suggestion.snippet_text());
   entry->SetString("publishDate",
                    TimeFormatShortDateAndTime(suggestion.publish_date()));
   entry->SetString("publisherName", suggestion.publisher_name());
   entry->SetString("id", "content-suggestion-" + base::IntToString(index));
   return entry;
 }
 
 std::string MapCategoryName(ContentSuggestionsCategory category) {

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

Should this be called GetCategoryName? Not sure what the "map" is saying here.

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

Done. GetCategoryTitle.

[Marc Treib, 2016/07/28 14:31:16]

It's not actually the title though, it's just a debug name. Then again, there's
a TODO there to make it the title, so okay.

-  switch (category) {
-    case ContentSuggestionsCategory::ARTICLES:
-      return "Articles";
-    case ContentSuggestionsCategory::OFFLINE_PAGES:
-      return "Offline pages (continue browsing)";
-    case ContentSuggestionsCategory::COUNT:
-      NOTREACHED() << "Category::COUNT must not be used as a value";
+  // TODO(pke): Replace this with the category's title.

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

I guess this should be a comment on the function?

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

Done.

+  if (category == KnownSuggestionsCategories::ARTICLES) {
+    return "Articles";
+  }
+  if (category == KnownSuggestionsCategories::OFFLINE_PAGES) {
+    return "Offline pages (continue browsing)";
   }
   return std::string();
 }
 
 std::string MapCategoryStatus(ContentSuggestionsCategoryStatus status) {

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

Similar here - GetCategoryStatusName?

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

Done.

   switch (status) {
     case ContentSuggestionsCategoryStatus::INITIALIZING:
       return "INITIALIZING";
     case ContentSuggestionsCategoryStatus::AVAILABLE:
       return "AVAILABLE";
     case ContentSuggestionsCategoryStatus::AVAILABLE_LOADING:
       return "AVAILABLE_LOADING";
     case ContentSuggestionsCategoryStatus::NOT_PROVIDED:
       return "NOT_PROVIDED";
     case ContentSuggestionsCategoryStatus::ALL_SUGGESTIONS_EXPLICITLY_DISABLED:
@@ skipping 274 matching lines @@
 }
 
 void SnippetsInternalsMessageHandler::SendString(const std::string& name,
                                                  const std::string& value) {
   base::StringValue string_name(name);
   base::StringValue string_value(value);
 
   web_ui()->CallJavascriptFunctionUnsafe(
       "chrome.SnippetsInternals.receiveProperty", string_name, string_value);
 }