Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: components/ntp_snippets/content_suggestions_service.cc

Issue 2102023002: Add ContentSuggestionsService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Marks comments Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/ntp_snippets/content_suggestions_service.cc
diff --git a/components/ntp_snippets/content_suggestions_service.cc b/components/ntp_snippets/content_suggestions_service.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d584826a0679fa713402fc221a33ce7744be680f
--- /dev/null
+++ b/components/ntp_snippets/content_suggestions_service.cc
@@ -0,0 +1,203 @@
+// 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 {
+
+ContentSuggestionsService::ContentSuggestionsService(State enabled)
+ : enabled_(enabled) {}
+
+ContentSuggestionsService::~ContentSuggestionsService() {}
+
+void ContentSuggestionsService::Shutdown() {
+ DCHECK(providers_.empty());
+ DCHECK(categories_.empty());
+ DCHECK(suggestions_by_category_.empty());
+ id_category_map_.clear();
Marc Treib 2016/07/05 14:50:50 Shouldn't this also be empty already?
Philipp Keck 2016/07/05 16:53:34 Done.
+ enabled_ = State::DISABLED;
+ FOR_EACH_OBSERVER(Observer, observers_, ContentSuggestionsServiceShutdown());
+ observers_.Clear();
+}
+
+ContentSuggestionsState ContentSuggestionsService::GetCategoryState(
+ ContentSuggestionCategory category) const {
+ if (enabled_ == State::DISABLED)
+ return ContentSuggestionsState::ALL_SUGGESTIONS_EXPLICITLY_DISABLED;
+
+ auto iterator = providers_.find(category);
+ if (iterator == providers_.end())
+ return ContentSuggestionsState::NOT_PROVIDED;
+
+ return iterator->second->GetCategoryState(category);
+}
+
+const std::vector<ContentSuggestion>&
+ContentSuggestionsService::GetSuggestionsForCategory(
+ ContentSuggestionCategory category) const {
+ auto iterator = suggestions_by_category_.find(category);
+ if (iterator == suggestions_by_category_.end()) {
+ return empty_categories_list_;
+ }
+ return iterator->second;
+}
+
+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());
+ }
+ ContentSuggestionCategory category = id_category_map_[suggestion_id];
+ if (!providers_.count(category)) {
+ LOG(WARNING) << "Requested image for suggestion " << suggestion_id
+ << " for unavailable category " << int(category);
+ 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& provider : providers_) {
+ provider.second->ClearCachedSuggestionsForDebugging();
+ }
+ FOR_EACH_OBSERVER(Observer, observers_, OnNewSuggestions());
+}
+
+void ContentSuggestionsService::ClearDiscardedSuggestionsForDebugging() {
+ for (auto& provider : providers_) {
+ provider.second->ClearDiscardedSuggestionsForDebugging();
+ }
+}
+
+void ContentSuggestionsService::DiscardSuggestion(
+ const std::string& suggestion_id) {
+ if (!id_category_map_.count(suggestion_id)) {
+ LOG(WARNING) << "Discarded unknown suggestion " << suggestion_id;
+ return;
+ }
+ ContentSuggestionCategory category = id_category_map_[suggestion_id];
+ if (!providers_.count(category)) {
+ LOG(WARNING) << "Discarded suggestion " << suggestion_id
+ << " for unavailable category " << int(category);
+ return;
+ }
+ providers_[category]->DiscardSuggestion(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(),
+ [&suggestion_id](const ContentSuggestion& suggestion) {
+ return suggestion_id == suggestion.id();
+ });
+ DCHECK(position != suggestions->end());
Marc Treib 2016/07/05 14:50:50 DCHECK_NE
Philipp Keck 2016/07/05 16:53:34 This didn't work because the compiler didn't like
Marc Treib 2016/07/06 08:20:44 Didn't like what, exactly? I guess it tried to "<<
Philipp Keck 2016/07/06 08:34:22 Acknowledged.
+ suggestions->erase(position);
+}
+
+void ContentSuggestionsService::AddObserver(Observer* observer) {
+ observers_.AddObserver(observer);
+}
+
+void ContentSuggestionsService::RemoveObserver(Observer* observer) {
+ observers_.RemoveObserver(observer);
+}
+
+void ContentSuggestionsService::RegisterProvider(
+ ContentSuggestionsProvider* provider) {
+ if (enabled_ == State::DISABLED)
+ return;
+
+ for (ContentSuggestionCategory 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 (provider->GetCategoryState(category) <=
+ ContentSuggestionsState::AVAILABLE) {
+ suggestions_by_category_[category].clear();
+ }
+ provider->SetObserver(this);
+ FOR_EACH_OBSERVER(
+ Observer, observers_,
+ OnCategoryStateChanged(category, provider->GetCategoryState(category)));
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Private methods
+
+void ContentSuggestionsService::OnNewSuggestions(
+ ContentSuggestionCategory 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());
+ }
+
+ suggestions_by_category_[changed_category] = std::move(new_suggestions);
+
+ for (const ContentSuggestion& suggestion : new_suggestions) {
+ id_category_map_[suggestion.id()] = suggestion.category();
+ }
+
+ FOR_EACH_OBSERVER(Observer, observers_, OnNewSuggestions());
+}
+
+void ContentSuggestionsService::OnCategoryStateChanged(
+ ContentSuggestionCategory changed_category,
+ ContentSuggestionsState new_state) {
+ if (new_state <= ContentSuggestionsState::AVAILABLE) {
+ for (const ContentSuggestion& suggestion :
+ suggestions_by_category_[changed_category]) {
+ id_category_map_.erase(suggestion.id());
+ }
+ suggestions_by_category_.erase(changed_category);
+ }
+ FOR_EACH_OBSERVER(Observer, observers_,
+ OnCategoryStateChanged(changed_category, new_state));
+}
+
+void ContentSuggestionsService::OnProviderShutdown(
+ ContentSuggestionsProvider* provider) {
+ for (ContentSuggestionCategory category : provider->provided_categories()) {
+ auto iterator = std::find(categories_.begin(), categories_.end(), category);
+ DCHECK(iterator != categories_.end());
Marc Treib 2016/07/05 14:50:50 DCHECK_NE
Philipp Keck 2016/07/05 16:53:34 Dito.
+ categories_.erase(iterator);
+ for (const ContentSuggestion& suggestion :
+ suggestions_by_category_[category]) {
+ id_category_map_.erase(suggestion.id());
+ }
+ suggestions_by_category_.erase(category);
+ providers_.erase(category);
+ FOR_EACH_OBSERVER(
+ Observer, observers_,
+ OnCategoryStateChanged(category, GetCategoryState(category)));
+ }
+ provider->SetObserver(nullptr);
Marc Treib 2016/07/05 14:50:50 Does this matter?
Philipp Keck 2016/07/05 16:53:34 Maybe not. It's also a precaution to avoid callbac
Marc Treib 2016/07/06 08:20:44 I'd say that it's the provider's responsibility to
Philipp Keck 2016/07/06 08:34:22 Done.
+}
+
+bool ContentSuggestionsService::IsCategoryRegistered(
+ ContentSuggestionCategory category) const {
+ return std::find(categories_.begin(), categories_.end(), category) !=
+ categories_.end();
+}
+
+} // namespace ntp_snippets

Powered by Google App Engine
This is Rietveld 408576698