diff options
| author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 07:36:46 +0000 |
|---|---|---|
| committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-04 07:36:46 +0000 |
| commit | 464d74a4031160fef333ef75a6b7ab7e47db4655 (patch) | |
| tree | 1322df3b2a7342bc2493385b79484d847001182c /chrome/browser/sync/profile_sync_service_base.h | |
| parent | f26317a9d95837d484728f518dced03ec40f082a (diff) | |
| download | chromium_src-464d74a4031160fef333ef75a6b7ab7e47db4655.zip chromium_src-464d74a4031160fef333ef75a6b7ab7e47db4655.tar.gz chromium_src-464d74a4031160fef333ef75a6b7ab7e47db4655.tar.bz2 | |
Unrevert "[Sync] Split GetPreferredTypes into GetActiveType...""
Original codereview at https://codereview.chromium.org/14789020/
This fixes the win_aura failure from the original patch.
BUG=none
TBR=dbeam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/16105012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203900 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_base.h')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_base.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/sync/profile_sync_service_base.h b/chrome/browser/sync/profile_sync_service_base.h index dfb5386..c73ae31 100644 --- a/chrome/browser/sync/profile_sync_service_base.h +++ b/chrome/browser/sync/profile_sync_service_base.h @@ -31,10 +31,9 @@ class ProfileSyncServiceBase { // any model-modifying operations. virtual bool ShouldPushChanges() = 0; - // Get the set of currently enabled data types (as chosen or - // configured by the user). See class comment on ProfileSyncService - // for more on what it means for a datatype to be Preferred. - virtual syncer::ModelTypeSet GetPreferredDataTypes() const = 0; + // Get the set of current active data types (those chosen or configured by + // the user which have not also encountered a runtime error). + virtual syncer::ModelTypeSet GetActiveDataTypes() const = 0; // Adds/removes an observer. ProfileSyncServiceBase does not take // ownership of the observer. |