Commit cf85fa31 authored by Marc Treib's avatar Marc Treib Committed by Commit Bot

Rename SyncTypePreferenceProvider::GetPreferredDataTypes to *Forced*

That's what it means, and it avoids confusion with other
GetPreferredDataTypes methods.

Bug: none
Change-Id: If47b53cf474252f8b27d91fc582e527059179ed3
Reviewed-on: https://chromium-review.googlesource.com/c/1341837Reviewed-by: default avatarFlorian Uunk <feuunk@chromium.org>
Commit-Queue: Marc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#609304}
parent f7d8dc7d
...@@ -984,7 +984,7 @@ void SupervisedUserService::SetExtensionsActive() { ...@@ -984,7 +984,7 @@ void SupervisedUserService::SetExtensionsActive() {
} }
#endif // BUILDFLAG(ENABLE_EXTENSIONS) #endif // BUILDFLAG(ENABLE_EXTENSIONS)
syncer::ModelTypeSet SupervisedUserService::GetPreferredDataTypes() const { syncer::ModelTypeSet SupervisedUserService::GetForcedDataTypes() const {
if (!ProfileIsSupervised()) if (!ProfileIsSupervised())
return syncer::ModelTypeSet(); return syncer::ModelTypeSet();
......
...@@ -174,7 +174,7 @@ class SupervisedUserService : public KeyedService, ...@@ -174,7 +174,7 @@ class SupervisedUserService : public KeyedService,
void Shutdown() override; void Shutdown() override;
// SyncTypePreferenceProvider implementation: // SyncTypePreferenceProvider implementation:
syncer::ModelTypeSet GetPreferredDataTypes() const override; syncer::ModelTypeSet GetForcedDataTypes() const override;
#if !defined(OS_ANDROID) #if !defined(OS_ANDROID)
// BrowserListObserver implementation: // BrowserListObserver implementation:
......
...@@ -1423,7 +1423,7 @@ syncer::ModelTypeSet ProfileSyncService::GetForcedDataTypes() const { ...@@ -1423,7 +1423,7 @@ syncer::ModelTypeSet ProfileSyncService::GetForcedDataTypes() const {
syncer::ModelTypeSet forced_types; syncer::ModelTypeSet forced_types;
for (const syncer::SyncTypePreferenceProvider* provider : for (const syncer::SyncTypePreferenceProvider* provider :
preference_providers_) { preference_providers_) {
forced_types.PutAll(provider->GetPreferredDataTypes()); forced_types.PutAll(provider->GetForcedDataTypes());
} }
return Intersection(forced_types, GetRegisteredDataTypes()); return Intersection(forced_types, GetRegisteredDataTypes());
} }
......
...@@ -11,7 +11,7 @@ namespace syncer { ...@@ -11,7 +11,7 @@ namespace syncer {
class SyncTypePreferenceProvider { class SyncTypePreferenceProvider {
public: public:
virtual ModelTypeSet GetPreferredDataTypes() const = 0; virtual ModelTypeSet GetForcedDataTypes() const = 0;
protected: protected:
virtual ~SyncTypePreferenceProvider() {} virtual ~SyncTypePreferenceProvider() {}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment