Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(214)

Unified Diff: chrome/browser/ui/webui/sync_setup_handler.cc

Issue 494973003: Disable checkboxes in the advanced sync settings overlay whose type is force-enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..6e68d8b45591e29df6c0f2d49d956ac90309e0d6 100644
--- a/chrome/browser/ui/webui/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/sync_setup_handler.cc
@@ -355,16 +355,18 @@ void SyncSetupHandler::DisplayConfigureSync(bool show_advanced,
// Tell the UI layer which data types are registered/enabled by the user.
const syncer::ModelTypeSet registered_types =
service->GetRegisteredDataTypes();
- const syncer::ModelTypeSet preferred_types =
- service->GetPreferredDataTypes();
+ const syncer::ModelTypeSet preferred_types = service->GetPreferredDataTypes();
+ const syncer::ModelTypeSet enforced_types = service->GetForcedDataTypes();
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);
« no previous file with comments | « chrome/browser/sync/profile_sync_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698