| Index: chrome/browser/ui/webui/sync_setup_handler.cc
|
| diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc
|
| index 244e307dcf2b602b9f3e2232d6f4239393b21b00..14ff9c2251c1dc8663ac344cd8f888e01e8893db 100644
|
| --- a/chrome/browser/ui/webui/sync_setup_handler.cc
|
| +++ b/chrome/browser/ui/webui/sync_setup_handler.cc
|
| @@ -357,14 +357,18 @@ void SyncSetupHandler::DisplayConfigureSync(bool show_advanced,
|
| service->GetRegisteredDataTypes();
|
| const syncer::ModelTypeSet preferred_types =
|
| service->GetPreferredDataTypes();
|
| + const syncer::ModelTypeSet enforced_types =
|
| + service->GetNonUserChoicePreferredDataTypes();
|
| ModelTypeNameMap type_names = GetSelectableTypeNameMap();
|
| for (ModelTypeNameMap::const_iterator it = type_names.begin();
|
| it != type_names.end(); ++it) {
|
| syncer::ModelType sync_type = it->first;
|
| const std::string key_name = it->second;
|
| - args.SetBoolean(key_name + "Registered",
|
| - registered_types.Has(sync_type));
|
| + args.SetBoolean(key_name + "Registered", registered_types.Has(sync_type));
|
| args.SetBoolean(key_name + "Synced", preferred_types.Has(sync_type));
|
| + args.SetBoolean(key_name + "Enforced", enforced_types.Has(sync_type));
|
| + // TODO(treib): How do we want to handle pref groups, i.e. when only some of
|
| + // the sync types behind a checkbox are force-enabled? crbug.com/403326
|
| }
|
| sync_driver::SyncPrefs sync_prefs(GetProfile()->GetPrefs());
|
| args.SetBoolean("passphraseFailed", passphrase_failed);
|
|
|