Rename discard to dismiss for NTP snippets and content suggestions

components/ntp_snippets/ntp_snippets_service.h

 // Copyright 2015 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.
 
 #ifndef COMPONENTS_NTP_SNIPPETS_NTP_SNIPPETS_SERVICE_H_
 #define COMPONENTS_NTP_SNIPPETS_NTP_SNIPPETS_SERVICE_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 74 matching lines @@
                      std::unique_ptr<NTPSnippetsStatusService> status_service);
 
   ~NTPSnippetsService() override;
 
   static void RegisterProfilePrefs(PrefRegistrySimple* registry);
 
   // Inherited from KeyedService.
   void Shutdown() override;
 
   // Returns whether the service is ready. While this is false, the list of
-  // snippets will be empty, and all modifications to it (fetch, discard, etc)
+  // snippets will be empty, and all modifications to it (fetch, dismiss, etc)
   // will be ignored.
   bool ready() const { return state_ == State::READY; }
 
   // Returns whether the service is initialized. While this is false, some
   // calls may trigger DCHECKs.
   bool initialized() const { return ready() || state_ == State::DISABLED; }
 
   // Fetches snippets from the server and adds them to the current ones.
   void FetchSnippets();
   // Fetches snippets from the server for specified hosts (overriding
   // suggestions from the suggestion service) and adds them to the current ones.
   // Only called from chrome://snippets-internals, DO NOT USE otherwise!
   // Ignored while |loaded()| is false.
   void FetchSnippetsFromHosts(const std::set<std::string>& hosts);
 
   // Available snippets.
   const NTPSnippet::PtrVector& snippets() const { return snippets_; }
 
-  // Returns the list of snippets previously discarded by the user (that are
+  // Returns the list of snippets previously dismissed by the user (that are
   // not expired yet).
-  const NTPSnippet::PtrVector& discarded_snippets() const {
-    return discarded_snippets_;
+  const NTPSnippet::PtrVector& dismissed_snippets() const {
+    return dismissed_snippets_;
   }
 
   const NTPSnippetsFetcher* snippets_fetcher() const {
     return snippets_fetcher_.get();
   }
 
   // Returns a reason why the service is disabled, or DisabledReason::NONE
   // if it's not.
   DisabledReason disabled_reason() const {
     return snippets_status_service_->disabled_reason();
   }
 
   // (Re)schedules the periodic fetching of snippets. This is necessary because
   // the schedule depends on the time of day.
   void RescheduleFetching();
 
   // ContentSuggestionsProvider implementation
   // TODO(pke): At some point reorder the implementations in the .cc file
   // accordingly.
   void SetObserver(Observer* observer) override;
   ContentSuggestionsCategoryStatus GetCategoryStatus(
       ContentSuggestionsCategory category) override;
-  void DiscardSuggestion(const std::string& suggestion_id) override;
+  void DismissSuggestion(const std::string& suggestion_id) override;
   void FetchSuggestionImage(const std::string& suggestion_id,
                             const ImageFetchedCallback& callback) override;
   void ClearCachedSuggestionsForDebugging() override;
-  void ClearDiscardedSuggestionsForDebugging() override;
+  void ClearDismissedSuggestionsForDebugging() override;
 
   // Returns the lists of suggestion hosts the snippets are restricted to.
   std::set<std::string> GetSuggestionsHosts() const;
 
   // Observer accessors.
   void AddObserver(NTPSnippetsServiceObserver* observer);
   void RemoveObserver(NTPSnippetsServiceObserver* observer);
 
   // Returns the maximum number of snippets that will be shown at once.
   static int GetMaxSnippetCountForTesting();
@@ skipping 54 matching lines @@
 
   // Callback for the NTPSnippetsFetcher.
   void OnFetchFinished(NTPSnippetsFetcher::OptionalSnippets snippets);
 
   // Merges newly available snippets with the previously available list.
   void MergeSnippets(NTPSnippet::PtrVector new_snippets);
 
   std::set<std::string> GetSnippetHostsFromPrefs() const;
   void StoreSnippetHostsToPrefs(const std::set<std::string>& hosts);
 
-  // Removes the expired snippets (including discarded) from the service and the
+  // Removes the expired snippets (including dismissed) from the service and the
   // database, and schedules another pass for the next expiration.
   void ClearExpiredSnippets();
 
   // Completes the initialization phase of the service, registering the last
   // observers. This is done after construction, once the database is loaded.
   void FinishInitialization();
 
   void OnSnippetImageFetchedFromDatabase(const std::string& snippet_id,
                                          const ImageFetchedCallback& callback,
                                          std::string data);
@@ skipping 35 matching lines @@
   void NotifyCategoryStatusChanged();
 
   State state_;
 
   ContentSuggestionsCategoryStatus category_status_;
 
   PrefService* pref_service_;
 
   suggestions::SuggestionsService* suggestions_service_;
 
-  // All current suggestions (i.e. not discarded ones).
+  // All current suggestions (i.e. not dismissed ones).
   NTPSnippet::PtrVector snippets_;
 
-  // Suggestions that the user discarded. We keep these around until they expire
+  // Suggestions that the user dismissed. We keep these around until they expire
   // so we won't re-add them on the next fetch.
-  NTPSnippet::PtrVector discarded_snippets_;
+  NTPSnippet::PtrVector dismissed_snippets_;
 
   // The ISO 639-1 code of the language used by the application.
   const std::string application_language_code_;
 
   // The observers.
   // TODO(pke): This is an old kind of observers that will be removed.
   base::ObserverList<NTPSnippetsServiceObserver> observers_;
 
   // The observer to deliver data to.
   Observer* observer_;
@@ skipping 45 matching lines @@
   // If the service might be enabled, DisabledReason::NONE will be provided.
   virtual void NTPSnippetsServiceDisabledReasonChanged(DisabledReason) = 0;
 
  protected:
   virtual ~NTPSnippetsServiceObserver() {}
 };
 
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_NTP_SNIPPETS_SERVICE_H_