diff options
| author | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-02 02:58:05 +0000 |
|---|---|---|
| committer | nick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-02 02:58:05 +0000 |
| commit | a1c2aef665b4abc30bbd6e2f8af5d5e68fc49eb4 (patch) | |
| tree | 3cb23a152fb2363d24b3f8e6218a4e0349df9506 /chrome/browser/sync/sync_setup_flow.cc | |
| parent | d2cf4787e75a7f0f431dede5a86e77f275148e1b (diff) | |
| download | chromium_src-a1c2aef665b4abc30bbd6e2f8af5d5e68fc49eb4.zip chromium_src-a1c2aef665b4abc30bbd6e2f8af5d5e68fc49eb4.tar.gz chromium_src-a1c2aef665b4abc30bbd6e2f8af5d5e68fc49eb4.tar.bz2 | |
Move enable/disable storage to prefs.
The ProfileSyncService will manage the enabled/disabled types. Remove
CustomizeSyncWindowView's DataTypeManager dependency; it should really
just be operating on the preferences via the ProfileSyncService.
Clarify the difference between types being enabled (meaning the user
wants to sync them) versus being advertisable (meaning we support the
datatype, and advertise that the user has the option of syncing it).
BUG=34209,38340
TEST=After syncing, open the options dialog and recustomize your
options. Verify that the enabled types from the wizard match the
initial state of the options window. After changing the options and
hitting "accept", observe that a breakpoint in DTM::Configure gets
triggered, with exactly the new configuration set. Verify that the
preferences are preserved on restart, as well as across Stop
Syncing / Start Syncing.
Review URL: http://codereview.chromium.org/1556009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43440 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/sync_setup_flow.cc')
| -rw-r--r-- | chrome/browser/sync/sync_setup_flow.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/browser/sync/sync_setup_flow.cc b/chrome/browser/sync/sync_setup_flow.cc index 3d55eb9..5ddf892 100644 --- a/chrome/browser/sync/sync_setup_flow.cc +++ b/chrome/browser/sync/sync_setup_flow.cc @@ -263,12 +263,9 @@ void SyncSetupFlow::GetArgsForGaiaLogin(const ProfileSyncService* service, // TODO(dantasse) Remove this when multi-datatype sync is live. #if defined(OS_WIN) || defined(OS_LINUX) - browser_sync::DataTypeController::StateMap states; - browser_sync::DataTypeController::StateMap* controller_states = &states; - service->GetDataTypeControllerStates(controller_states); - args->SetBoolean(L"showCustomize", - controller_states->count(syncable::PREFERENCES) || - controller_states->count(syncable::AUTOFILL)); + syncable::ModelTypeSet registered_datatypes; + service->GetRegisteredDataTypes(®istered_datatypes); + args->SetBoolean(L"showCustomize", registered_datatypes.size() > 1); #else args->SetBoolean(L"showCustomize", false); #endif |