📰 Let the backend trigger sign in related refreshes

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 <set>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "components/ntp_snippets/pref_names.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "ui/gfx/image/image.h"
 
 namespace ntp_snippets {
 
 ContentSuggestionsService::ContentSuggestionsService(
     State state,
+    SigninManagerBase* signin_manager,
     history::HistoryService* history_service,
     PrefService* pref_service)
     : state_(state),
+      signin_observer_(this),
       history_service_observer_(this),
       ntp_snippets_service_(nullptr),
       pref_service_(pref_service),
       user_classifier_(pref_service) {
   // Can be null in tests.
+  if (signin_manager) {
+    signin_observer_.Add(signin_manager);
+  }
+
   if (history_service)
     history_service_observer_.Add(history_service);
 
   RestoreDismissedCategoriesFromPrefs();
 }
 
 ContentSuggestionsService::~ContentSuggestionsService() = default;
 
 void ContentSuggestionsService::Shutdown() {
   ntp_snippets_service_ = nullptr;
@@ skipping 218 matching lines @@
 }
 
 void ContentSuggestionsService::OnSuggestionInvalidated(
     ContentSuggestionsProvider* provider,
     const ContentSuggestion::ID& suggestion_id) {
   RemoveSuggestionByID(suggestion_id);
   for (Observer& observer : observers_)
     observer.OnSuggestionInvalidated(suggestion_id);
 }
 
+// SigninManagerBase::Observer implementation
+void ContentSuggestionsService::GoogleSigninSucceeded(
+    const std::string& account_id,
+    const std::string& username,
+    const std::string& password) {
+  OnSignInStateChanged();
+};

[Bernhard Bauer, 2016/11/21 15:48:15]

Nit: empty line between method bodies.

[dgn, 2016/11/21 16:22:08]

Done.

+void ContentSuggestionsService::GoogleSignedOut(const std::string& account_id,

[Marc Treib, 2016/11/21 15:48:53]

nit: empty line before

[dgn, 2016/11/21 16:22:08]

Done.

+                                                const std::string& username) {
+  OnSignInStateChanged();
+}
+
 // history::HistoryServiceObserver implementation.
 void ContentSuggestionsService::OnURLsDeleted(
     history::HistoryService* history_service,
     bool all_history,
     bool expired,
     const history::URLRows& deleted_rows,
     const std::set<GURL>& favicon_urls) {
   // We don't care about expired entries.
   if (expired)
     return;
@@ skipping 104 matching lines @@
   suggestions->erase(position);
 
   return true;
 }
 
 void ContentSuggestionsService::NotifyCategoryStatusChanged(Category category) {
   for (Observer& observer : observers_)
     observer.OnCategoryStatusChanged(category, GetCategoryStatus(category));
 }
 
+void ContentSuggestionsService::OnSignInStateChanged() {
+  // First notify the providers, so they can make the required changes.
+  for (const auto& provider : providers_) {
+    provider->OnSignInStateChanged();
+  }
+
+  // Finally notify the observers so they refresh only after the backend is
+  // ready.
+  for (Observer& observer : observers_) {
+    observer.OnFullRefreshRequired();
+  }
+}
+
 void ContentSuggestionsService::SortCategories() {
   std::sort(categories_.begin(), categories_.end(),
             [this](const Category& left, const Category& right) {
               return category_factory_.CompareCategories(left, right);
             });
 }
 
 bool ContentSuggestionsService::IsCategoryDismissed(Category category) const {
   return base::ContainsKey(dismissed_providers_by_category_, category);
 }
@@ skipping 34 matching lines @@
 void ContentSuggestionsService::StoreDismissedCategoriesToPrefs() {
   base::ListValue list;
   for (const auto& category_provider_pair : dismissed_providers_by_category_) {
     list.AppendInteger(category_provider_pair.first.id());
   }
 
   pref_service_->Set(prefs::kDismissedCategories, list);
 }
 
 }  // namespace ntp_snippets