OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "components/ntp_snippets/content_suggestions_service.h" | 5 #include "components/ntp_snippets/content_suggestions_service.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <iterator> | 8 #include <iterator> |
9 #include <set> | 9 #include <set> |
10 #include <utility> | 10 #include <utility> |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 } | 155 } |
156 providers_by_category_[category]->DismissSuggestion(suggestion_id); | 156 providers_by_category_[category]->DismissSuggestion(suggestion_id); |
157 | 157 |
158 // Remove the suggestion locally. | 158 // Remove the suggestion locally. |
159 bool removed = RemoveSuggestionByID(category, suggestion_id); | 159 bool removed = RemoveSuggestionByID(category, suggestion_id); |
160 DCHECK(removed) << "The dismissed suggestion " << suggestion_id | 160 DCHECK(removed) << "The dismissed suggestion " << suggestion_id |
161 << " has already been removed. Providers must not call" | 161 << " has already been removed. Providers must not call" |
162 << " OnNewSuggestions in response to DismissSuggestion."; | 162 << " OnNewSuggestions in response to DismissSuggestion."; |
163 } | 163 } |
164 | 164 |
| 165 void ContentSuggestionsService::DismissCategory(Category category) { |
| 166 auto providers_it = providers_by_category_.find(category); |
| 167 if (providers_it == providers_by_category_.end()) |
| 168 return; |
| 169 |
| 170 providers_by_category_.erase(providers_it); |
| 171 categories_.erase( |
| 172 std::find(categories_.begin(), categories_.end(), category)); |
| 173 } |
| 174 |
165 void ContentSuggestionsService::AddObserver(Observer* observer) { | 175 void ContentSuggestionsService::AddObserver(Observer* observer) { |
166 observers_.AddObserver(observer); | 176 observers_.AddObserver(observer); |
167 } | 177 } |
168 | 178 |
169 void ContentSuggestionsService::RemoveObserver(Observer* observer) { | 179 void ContentSuggestionsService::RemoveObserver(Observer* observer) { |
170 observers_.RemoveObserver(observer); | 180 observers_.RemoveObserver(observer); |
171 } | 181 } |
172 | 182 |
173 void ContentSuggestionsService::RegisterProvider( | 183 void ContentSuggestionsService::RegisterProvider( |
174 std::unique_ptr<ContentSuggestionsProvider> provider) { | 184 std::unique_ptr<ContentSuggestionsProvider> provider) { |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 Category category, | 222 Category category, |
213 CategoryStatus new_status) { | 223 CategoryStatus new_status) { |
214 if (!IsCategoryStatusAvailable(new_status)) { | 224 if (!IsCategoryStatusAvailable(new_status)) { |
215 for (const ContentSuggestion& suggestion : | 225 for (const ContentSuggestion& suggestion : |
216 suggestions_by_category_[category]) { | 226 suggestions_by_category_[category]) { |
217 id_category_map_.erase(suggestion.id()); | 227 id_category_map_.erase(suggestion.id()); |
218 } | 228 } |
219 suggestions_by_category_.erase(category); | 229 suggestions_by_category_.erase(category); |
220 } | 230 } |
221 if (new_status == CategoryStatus::NOT_PROVIDED) { | 231 if (new_status == CategoryStatus::NOT_PROVIDED) { |
222 auto providers_it = providers_by_category_.find(category); | 232 DCHECK(providers_by_category_.find(category) != |
223 DCHECK(providers_it != providers_by_category_.end()); | 233 providers_by_category_.end()); |
224 DCHECK_EQ(provider, providers_it->second); | 234 DCHECK_EQ(provider, providers_by_category_.find(category)->second); |
225 providers_by_category_.erase(providers_it); | 235 DismissCategory(category); |
226 categories_.erase( | |
227 std::find(categories_.begin(), categories_.end(), category)); | |
228 } else { | 236 } else { |
229 RegisterCategoryIfRequired(provider, category); | 237 RegisterCategoryIfRequired(provider, category); |
230 DCHECK_EQ(new_status, provider->GetCategoryStatus(category)); | 238 DCHECK_EQ(new_status, provider->GetCategoryStatus(category)); |
231 } | 239 } |
232 NotifyCategoryStatusChanged(category); | 240 NotifyCategoryStatusChanged(category); |
233 } | 241 } |
234 | 242 |
235 void ContentSuggestionsService::OnSuggestionInvalidated( | 243 void ContentSuggestionsService::OnSuggestionInvalidated( |
236 ContentSuggestionsProvider* provider, | 244 ContentSuggestionsProvider* provider, |
237 Category category, | 245 Category category, |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
349 if (left.IsKnownCategory(KnownCategories::BOOKMARKS)) | 357 if (left.IsKnownCategory(KnownCategories::BOOKMARKS)) |
350 return false; | 358 return false; |
351 if (right.IsKnownCategory(KnownCategories::BOOKMARKS)) | 359 if (right.IsKnownCategory(KnownCategories::BOOKMARKS)) |
352 return true; | 360 return true; |
353 } | 361 } |
354 return category_factory_.CompareCategories(left, right); | 362 return category_factory_.CompareCategories(left, right); |
355 }); | 363 }); |
356 } | 364 } |
357 | 365 |
358 } // namespace ntp_snippets | 366 } // namespace ntp_snippets |
OLD | NEW |